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

Use dummy switch instead of dummy loop in MergeReturn pass. #3151

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Use dummy switch instead of dummy loop in MergeReturn pass. #3151

merged 1 commit into from
Jan 24, 2020

Conversation

greg-lunarg
Copy link
Contributor

Fixes #3127

@greg-lunarg
Copy link
Contributor Author

The shaderc-smoketest seems to not like SPV_ENV_VULKAN_1_2

@s-perron s-perron self-requested a review January 24, 2020 17:13
s-perron
s-perron approved these changes Jan 24, 2020
View reviewed changes
Copy link
Collaborator

@s-perron s-perron left a comment

Choose a reason for hiding this comment

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

This looks really good. Thanks for getting this done. It will make the code look a little simpler.

@s-perron s-perron merged commit e7afeb0 into KhronosGroup:master Jan 24, 2020
@alan-baker alan-baker mentioned this pull request Jan 28, 2020
Merged
@wrielxc wrielxc mentioned this pull request Apr 9, 2020
Closed
dneto0 pushed a commit to dneto0/SPIRV-Tools that referenced this pull request Sep 14, 2024
@zoddicus
Rolling 5 dependencies and updating expectations (KhronosGroup#975)
821d564 
Roll third_party/glslang/ 965bd4d..19ec0d2 (4 commits)

KhronosGroup/glslang@965bd4d...19ec0d2

$ git log 965bd4d..19ec0d2 --date=short --no-merges --format='%ad %ae %s'
2020-01-27 cepheus Build: Fix more build warnings caused by PR KhronosGroup#2038.
2020-01-26 cepheus Build warning: Fix KhronosGroup#2062, missing enum value in a switch.
2019-12-24 laddoc Add Tess machine dependent built-in variables initialization for GLES 3.2
2019-10-18 timo.suoranta Fixes for gcc 9 / -Werror=deprecated-copy

Roll third_party/googletest/ 8b4817e3d..10b1902d8 (6 commits)

google/googletest@8b4817e...10b1902

$ git log 8b4817e3d..10b1902d8 --date=short --no-merges --format='%ad %ae %s'
2020-01-21 absl-team Googletest export
2020-01-17 absl-team Googletest export
2020-01-16 absl-team Googletest export
2020-01-15 36923279+ivan1993br Remove exclusion of *-main and*-all targets
2020-01-12 hilmanbeyri Use IsReadableTypeName IsReadableTypeName in OfType function in gmock-matchers_test.cc
2020-01-12 hilmanbeyri fix unit test failure on NoShortCircuitOnFailure and DetectsFlakyShortCircuit when GTEST_HAS_RTTI is 1

Roll third_party/spirv-cross/ f9818f080..68bf0f824 (6 commits)

KhronosGroup/SPIRV-Cross@f9818f0...68bf0f8

$ git log f9818f080..68bf0f824 --date=short --no-merges --format='%ad %ae %s'
2020-01-27 post Compile fix on older compilers.
2020-01-27 post GLSL: Support GL_ARB_enchanced_layouts for XFB.
2020-01-25 cdavis MSL: Move inline uniform blocks to the end of the argument buffer.
2019-12-16 cdavis MSL: Support inline uniform blocks in argument buffers.
2020-01-23 post Make SmallVector noexcept.
2020-01-22 42098783+barath121 Typo at line 324

Roll third_party/spirv-headers/ 204cd13..dc77030 (2 commits)

KhronosGroup/SPIRV-Headers@204cd13...dc77030

$ git log 204cd13..dc77030 --date=short --no-merges --format='%ad %ae %s'
2020-01-20 dneto Fix the license to match LICENSE
2020-01-20 syoussefi Add BUILD.gn

Roll third_party/spirv-tools/ 323a81f..1b34410 (9 commits)

KhronosGroup/SPIRV-Tools@323a81f...1b34410

$ git log 323a81f..1b34410 --date=short --no-merges --format='%ad %ae %s'
2020-01-24 syoussefi Fix chromium build (KhronosGroup#3152)
2020-01-24 dneto Clarify mapping of target env to SPIR-V version (KhronosGroup#3150)
2020-01-24 greg Use dummy switch instead of dummy loop in MergeReturn pass. (KhronosGroup#3151)
2020-01-23 alanbaker Fix structured exit validation (KhronosGroup#3141)
2020-01-23 dneto Add spvParseVulkanEnv (KhronosGroup#3142)
2020-01-23 jaebaek Handle conflict between debug info and existing validation rule (KhronosGroup#3104)
2020-01-23 syoussefi Use spirv-headers' BUILD.gn (KhronosGroup#3148)
2020-01-23 syoussefi Roll external/spirv-headers/ af64a9e..dc77030 (4 commits) (KhronosGroup#3147)
2020-01-21 afdx spirv-fuzz: Refactoring and type-related fixes (KhronosGroup#3144)

Created with:
  roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s-perron s-perron s-perron approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Improve MergeReturn to not add loop when function does not contain one
2 participants
@greg-lunarg @s-perron