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

Remove shader variants from msaa sample #1231

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove shader variants from msaa sample #1231

wants to merge 1 commit into from

Conversation

tomadamatkinson
Copy link
Collaborator

Description

Contribution towards #1107

Removes shader variant usage from MSAA (other than base shaders)

Keeps existing behavior by creating two pipelines. One with MS Depth enabled and one without

General Checklist:

Please ensure the following points are checked:

  • My code follows the coding style
  • I have reviewed file licenses
  • I have commented any added functions (in line with Doxygen)
  • I have commented any code that could be hard to understand
  • My changes do not add any new compiler warnings
  • My changes do not add any new validation layer errors or warnings
  • I have used existing framework/helper functions where possible
  • My changes do not add any regressions
  • I have tested every sample to ensure everything runs correctly
  • This PR describes the scope and expected impact of the changes I am making

Note: The Samples CI runs a number of checks including:

  • I have updated the header Copyright to reflect the current year (CI build will fail if Copyright is out of date)
  • My changes build on Windows, Linux, macOS and Android. Otherwise I have documented any exceptions

If this PR contains framework changes:

  • I did a full batch run using the batch command line argument to make sure all samples still work properly

Sample Checklist

If your PR contains a new or modified sample, these further checks must be carried out in addition to the General Checklist:

  • I have tested the sample on at least one compliant Vulkan implementation
  • If the sample is vendor-specific, I have tagged it appropriately
  • I have stated on what implementation the sample has been tested so that others can test on different implementations and platforms
  • Any dependent assets have been merged and published in downstream modules
  • For new samples, I have added a paragraph with a summary to the appropriate chapter in the readme of the folder that the sample belongs to e.g. api samples readme
  • For new samples, I have added a tutorial README.md file to guide users through what they need to know to implement code using this feature. For example, see conditional_rendering
  • For new samples, I have added a link to the Antora navigation so that the sample will be listed at the Vulkan documentation site

@tomadamatkinson tomadamatkinson requested a review from a team November 19, 2024 21:04
@tomadamatkinson tomadamatkinson self-assigned this Nov 19, 2024
tomadamatkinson
tomadamatkinson commented Nov 19, 2024
View reviewed changes
samples/performance/msaa/msaa.cpp
@@ -587,7 +590,10 @@ void MSAASample::postprocessing(vkb::CommandBuffer &command_buffer, vkb::RenderT

glm::vec4 near_far = {camera->get_far_plane(), camera->get_near_plane(), -1.0f, -1.0f};

auto &postprocessing_pass = postprocessing_pipeline->get_pass(0);
// Select the currently active pipeline
auto &pipeline = multisampled_depth ? ms_depth_postprocessing_pipeline : postprocessing_pipeline;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This line is what replaces existing behavior

tomadamatkinson
tomadamatkinson commented Nov 19, 2024
View reviewed changes
shaders/postprocessing/outline.frag
@@ -62,9 +54,5 @@ void main(void)
outline += depth - getDepth(ivec2(thickness, 0));
outline += depth - getDepth(ivec2(0, -thickness));

#ifdef OUTLINE_ONLY
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This define is never set anywhere so i removed it

@asuessenbach
Copy link
Contributor

For whatever reason, I can't get this PR to compile locally.
Something about a failing custom build on shaders\ray_tracing_position_fetch\hlsl\closesthit.rchit.hlsl?

Maybe you could rebase against main?

asuessenbach
asuessenbach approved these changes Dec 3, 2024
View reviewed changes
Copy link
Contributor

@asuessenbach asuessenbach left a comment

Choose a reason for hiding this comment

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

For whatever reason, I don't get that build error anymore!

@asuessenbach
Copy link
Contributor

Maybe add outline_ms_depth.frag under SHADER_FILES_GLSL in CMakeLists.txt.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gary-sweet gary-sweet gary-sweet approved these changes

@asuessenbach asuessenbach asuessenbach approved these changes

@SaschaWillems SaschaWillems SaschaWillems approved these changes

@JoseEmilio-ARM JoseEmilio-ARM Awaiting requested review from JoseEmilio-ARM

Assignees

@tomadamatkinson tomadamatkinson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tomadamatkinson @asuessenbach @SaschaWillems @gary-sweet