Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 64 bits optionnal check for DXR wizard (for DXR player) #1632

Merged
merged 6 commits into from Sep 15, 2020
Merged

Add 64 bits optionnal check for DXR wizard (for DXR player) #1632

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35f24d7
Add 64 bits optionnal check for DXR wizard (for DXR player)
remi-chapelain Aug 18, 2020
ab60689
Added changelog entry
remi-chapelain Aug 18, 2020
2dde67d
Changed the check to a required one with a fix button
remi-chapelain Aug 20, 2020
0179e57
Change obsolete switch target function
remi-chapelain Aug 20, 2020
01d77a4
Fix ordering to avoid breaking the resources group
remi-chapelain Aug 21, 2020
c7a35eb
Merge branch 'HDRP/staging' into HDRP/64bits-optional-check-DXR-wizard
sebastienlagarde Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -166,6 +166,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added missing API documentation.
- Added an option to have only the metering mask displayed in the debug mode.
- Added a new mode to cluster visualization debug where users can see a slice instead of the cluster on opaque objects.
- Added an optional check in the HDRP DXR Wizard to verify 64 bits target architecture

### Fixed
- Fix when rescale probe all direction below zero (1219246)
Expand Down
10 changes: 9 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
View file
Open in desktop
Expand Up @@ -174,6 +174,8 @@ Entry[] entries
new Entry(InclusiveScope.DXR, Style.dxrStaticBatching, IsDXRStaticBatchingCorrect, FixDXRStaticBatching),
new Entry(InclusiveScope.DXR, Style.dxrActivated, IsDXRActivationCorrect, FixDXRActivation),
new Entry(InclusiveScope.DXR, Style.dxrResources, IsDXRAssetCorrect, FixDXRAsset),
new Entry(InclusiveScope.DXR, Style.dxr64bits, IsArchitecture64Bits, FixArchitecture64Bits),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this line one line above to not break grouping of "DXR Resources"


// Optional checks
new Entry(InclusiveScope.DXROptional, Style.dxrScreenSpaceShadow, IsDXRScreenSpaceShadowCorrect, null, forceDisplayCheck: true, skipErrorIcon: true),
new Entry(InclusiveScope.DXROptional, Style.dxrReflections, IsDXRReflectionsCorrect, null, forceDisplayCheck: true, skipErrorIcon: true),
Expand Down Expand Up @@ -656,7 +658,13 @@ bool IsDXRTransparentReflectionsCorrect()
bool IsDXRGICorrect()
=> HDRenderPipeline.currentAsset != null
&& HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.supportSSGI;


bool IsArchitecture64Bits()
=> EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64;
void FixArchitecture64Bits(bool fromAsyncUnused)
{
EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows64);
}

bool IsDXRStaticBatchingCorrect()
=> !GetStaticBatching(CalculateSelectedBuildTarget());
Expand Down
5 changes: 4 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs
View file
Open in desktop
Expand Up @@ -148,7 +148,10 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT
public static readonly ConfigStyle dxrGI = new ConfigStyle(
label: "Global Illumination",
error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Info);
public static readonly ConfigStyle dxrStaticBatching = new ConfigStyle(
public static readonly ConfigStyle dxr64bits = new ConfigStyle(
label: "Architecture 64 bits",
error: "To build your Project to a Unity Player, ray tracing requires that the build uses 64 bit architecture.");
public static readonly ConfigStyle dxrStaticBatching = new ConfigStyle(
label: "Static Batching",
error: "Static Batching is not supported!");
public static readonly ConfigStyle dxrActivated = new ConfigStyle(
Expand Down