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.

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

Satisfied warnings & errors for updated dxrflcompiler #415

Merged
merged 2 commits into from
Jul 20, 2018

Conversation

rgerd
Copy link
Contributor

@rgerd rgerd commented Jul 19, 2018

  • Added static to function definitions using resource types (i.e. RWByteAddressBufferPointer) in parameters or return type to force inlining so that the compiler doesn't get upset

  • Dispatched rays are now indexed in 3d, but our shaders only need the first two dimensions (so far)

  • Brought in changes from develop-dxr

@rgerd rgerd requested a review from pkristof July 19, 2018 20:28
@rgerd rgerd force-pushed the develop-dxr-compilerFixes branch from 038da91 to 8480822 Compare July 19, 2018 20:39
@rgerd rgerd changed the title Satisfied warnings & errors for new hlsl compiler Satisfied warnings & errors for updated dxrflcompiler Jul 19, 2018
@clandrew
Copy link
Contributor

Verified with Robert that, while this validation was added for the new compiler, it also works with the old compiler (so we don't have some additional versioning problem introduced here. No action

@@ -90,6 +90,39 @@ float4 CalculatePhongLighting(in float4 albedo, in float3 normal, in bool isInSh
return ambientColor + diffuseColor + specularColor;
}

// Load three 16 bit indices.
Copy link

@pkristof pkristof Jul 19, 2018

Choose a reason for hiding this comment

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

Does the sample fail to compile with the helper function being in the helper header? If not, this is not desired. This was put to a helper header as the samples move code introduced in previous samples and code that is not of the primary goal of the sample to helpers to make the new sample focused on what it's trying to show and keep the code footprint small(er) in the primary source files .

@rgerd rgerd changed the base branch from develop-dxr to develop-dxr-rs5 July 19, 2018 23:21
@rgerd rgerd force-pushed the develop-dxr-compilerFixes branch 2 times, most recently from 380f166 to 971e090 Compare July 20, 2018 17:22
@rgerd rgerd force-pushed the develop-dxr-compilerFixes branch from 971e090 to fe8a6e8 Compare July 20, 2018 18:14
@rgerd rgerd merged commit 4f29bab into develop-dxr-rs5 Jul 20, 2018
@rgerd rgerd deleted the develop-dxr-compilerFixes branch July 20, 2018 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants