GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.9' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-02 00:58:25 +02:00
parent c8b5ac6c29 f4d4969650
commit 567d5f70ab
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
View File

@@ -535,6 +535,9 @@ bool GlobalSurfaceAtlasPass::Init()
// Check platform support // Check platform support
const auto device = GPUDevice::Instance; const auto device = GPUDevice::Instance;
_supported = device->GetFeatureLevel() >= FeatureLevel::SM5 && device->Limits.HasCompute && device->Limits.HasTypedUAVLoad; _supported = device->GetFeatureLevel() >= FeatureLevel::SM5 && device->Limits.HasCompute && device->Limits.HasTypedUAVLoad;
#if PLATFORM_APPLE_FAMILY
_supported = false; // Vulkan over Metal has some issues in complex scenes with DDGI
#endif
return false; return false;
} }

4
Source/Tools/Flax.Build/Build/Builder.Projects.cs
View File

@@ -179,8 +179,7 @@ namespace Flax.Build
using (new ProfileEventScope("GenerateProjects")) using (new ProfileEventScope("GenerateProjects"))
{ {
// Pick the project format // Pick the project format
HashSet<ProjectFormat> projectFormats = new HashSet<ProjectFormat>(); var projectFormats = new HashSet<ProjectFormat>();
if (Configuration.ProjectFormatVS2022) if (Configuration.ProjectFormatVS2022)
projectFormats.Add(ProjectFormat.VisualStudio2022); projectFormats.Add(ProjectFormat.VisualStudio2022);
if (Configuration.ProjectFormatVS2019) if (Configuration.ProjectFormatVS2019)
@@ -195,7 +194,6 @@ namespace Flax.Build
projectFormats.Add(ProjectFormat.VisualStudio2022); projectFormats.Add(ProjectFormat.VisualStudio2022);
if (!string.IsNullOrEmpty(Configuration.ProjectFormatCustom)) if (!string.IsNullOrEmpty(Configuration.ProjectFormatCustom))
projectFormats.Add(ProjectFormat.Custom); projectFormats.Add(ProjectFormat.Custom);
if (projectFormats.Count == 0) if (projectFormats.Count == 0)
projectFormats.Add(Platform.BuildPlatform.DefaultProjectFormat); projectFormats.Add(Platform.BuildPlatform.DefaultProjectFormat);

1
Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
View File

@@ -553,6 +553,7 @@ namespace Flax.Build.Projects.VisualStudioCode
{ {
var toolchain = platform.GetToolchain(architecture); var toolchain = platform.GetToolchain(architecture);
var targetBuildOptions = Builder.GetBuildOptions(target, platform, toolchain, architecture, configuration, Globals.Root); var targetBuildOptions = Builder.GetBuildOptions(target, platform, toolchain, architecture, configuration, Globals.Root);
targetBuildOptions.Flags |= NativeCpp.BuildFlags.GenerateProject;
var modules = Builder.CollectModules(rules, platform, target, targetBuildOptions, toolchain, architecture, configuration); var modules = Builder.CollectModules(rules, platform, target, targetBuildOptions, toolchain, architecture, configuration);
foreach (var module in modules) foreach (var module in modules)
{ {