Merge branch 'master' of https://github.com/GPUOpen-Tools/CodeXL

Author: cal3d

CodeXL/AllProjectsBuild/CodeXL-AllProjects.sln

@@ -257,6 +257,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CXLProcessEnum", "..\Compon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMDCodeXL", "..\App\AMDCodeXL.vcxproj", "{8482FB9F-A940-44E3-9841-F13465C2A2B6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6} = {D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B} = {C1F67D19-DD6E-4946-B16D-F4F4D125424B}
 		{7D54BF26-FBD8-481F-AAA2-91BAB54A3CCD} = {7D54BF26-FBD8-481F-AAA2-91BAB54A3CCD}
 		{94C28338-2EF8-4E26-8375-A93A68FE8146} = {94C28338-2EF8-4E26-8375-A93A68FE8146}
 		{1C20A760-CEE0-4676-9976-DD0188FFD2C8} = {1C20A760-CEE0-4676-9976-DD0188FFD2C8}
@@ -376,6 +378,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CXLThreadProfileAPI", "..\C
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CXLPowerProfilePlugin", "..\Components\PowerProfiling\Backend\AMDTPowerProfilePlugin\AMDTPowerProfilePlugin.vcxproj", "{A5541D02-4F42-45BE-A579-A832B235AF5E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KernelAnalyzer", "KernelAnalyzer", "{48291822-1391-46AD-981D-2F628C599292}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CXLAnalyzer", "..\Components\ShaderAnalyzer\AMDTKernelAnalyzer\AMDTKernelAnalyzer.vcxproj", "{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CXLAnalysisBackend", "..\Components\ShaderAnalyzer\AMDTBackEnd\AMDTBackEndVS14.vcxproj", "{C1F67D19-DD6E-4946-B16D-F4F4D125424B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1012,6 +1020,28 @@ Global
 		{A5541D02-4F42-45BE-A579-A832B235AF5E}.Teapot-Debug|Win32.Build.0 = Debug|Win32
 		{A5541D02-4F42-45BE-A579-A832B235AF5E}.Teapot-Debug|x64.ActiveCfg = Debug|x64
 		{A5541D02-4F42-45BE-A579-A832B235AF5E}.Teapot-Debug|x64.Build.0 = Debug|x64
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Debug|Win32.Build.0 = Debug|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Debug|x64.ActiveCfg = Debug|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Release|Win32.ActiveCfg = Release|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Release|Win32.Build.0 = Release|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Release|x64.ActiveCfg = Release|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Teapot-Debug|Win32.ActiveCfg = Debug|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Teapot-Debug|Win32.Build.0 = Debug|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Teapot-Debug|x64.ActiveCfg = Release|Win32
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6}.Teapot-Debug|x64.Build.0 = Release|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Debug|Win32.Build.0 = Debug|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Debug|x64.ActiveCfg = Debug|x64
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Debug|x64.Build.0 = Debug|x64
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Release|Win32.ActiveCfg = Release|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Release|Win32.Build.0 = Release|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Release|x64.ActiveCfg = Release|x64
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Release|x64.Build.0 = Release|x64
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Teapot-Debug|Win32.ActiveCfg = Debug|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Teapot-Debug|Win32.Build.0 = Debug|Win32
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Teapot-Debug|x64.ActiveCfg = Debug|x64
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B}.Teapot-Debug|x64.Build.0 = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1081,5 +1111,7 @@ Global
 		{8341BDB2-8A70-46DC-B47C-7F51B9694B35} = {B5E9CB00-DE4C-4434-8193-2CBF121B03B6}
 		{63FAB7FE-DE15-420B-B231-66C5BD95D319} = {28049FA1-F84B-44BF-9DBF-C4FB29FDD000}
 		{A5541D02-4F42-45BE-A579-A832B235AF5E} = {B5E9CB00-DE4C-4434-8193-2CBF121B03B6}
+		{D1A4A718-6E7F-4AF3-AB0C-7B387DFDA9A6} = {48291822-1391-46AD-981D-2F628C599292}
+		{C1F67D19-DD6E-4946-B16D-F4F4D125424B} = {48291822-1391-46AD-981D-2F628C599292}
 	EndGlobalSection
 EndGlobal