Resolve C2360 for VS2026 by hoisting switch-local declarations#125
Closed
BinqAdams wants to merge 1 commit intoNVIDIAGameWorks:mainfrom
Closed
Resolve C2360 for VS2026 by hoisting switch-local declarations#125BinqAdams wants to merge 1 commit intoNVIDIAGameWorks:mainfrom
BinqAdams wants to merge 1 commit intoNVIDIAGameWorks:mainfrom
Conversation
| # Get path to Visual Studio installation using vswhere. | ||
| # | ||
| $vsPath = &$vsWhere -latest -version "[16.0,18.0)" -products * ` | ||
| $vsPath = &$vsWhere -latest -products * ` |
Collaborator
There was a problem hiding this comment.
Completely removing the version check is probably a bad idea - could cause problems for people with older VS versions installed. Should this just be -version "[16.0,19.0)" instead?
Contributor
Author
There was a problem hiding this comment.
I've put this in :)
Collaborator
|
Please squash your commits. |
BinqAdams
force-pushed
the
refactor/c2360-workgroup-braces
branch
from
b1d6f64 to
8c65bfd
Compare
Contributor
Author
Squashed! |
| ctx->dispatch(workgroups.width, workgroups.height, workgroups.depth); | ||
| } | ||
| case RaytraceMode::RayQuery: { | ||
| VkExtent3D workgroups = util::computeBlockCount(rayDims, VkExtent3D { 16, 8, 1 }); |
Collaborator
There was a problem hiding this comment.
(sorry about the long delay, got rather busy for a bit)
Instead of adding large braces like this, a better fix would be to move the VkExtent3D workgroups declarations outside of the switch statements - so it should look like
VkExtent3D workgroups;
switch (blah) {
case RayQuery:
workgroups = blah;
...
When DXVK Remix is built with MSVC 19.x (Visual Studio 2026) under /WX, the compiler emits C2360 / C2361 errors for every case body that declares a local VkExtent3D directly under the case label without an intervening block. The C++ rule is that a non-trivial initialization cannot be jumped over by other case labels in the same switch. Hoist the workgroups computation above the switch in three pathtracer dispatch sites: - rtx_pathtracer_gbuffer.cpp - rtx_pathtracer_integrate_direct.cpp - rtx_pathtracer_integrate_indirect.cpp Each switch only ever uses workgroups in its RayQuery case (other modes call traceRays); the value is the same expression in all three files. Hoisting makes it const, kills the C2360 / C2361, and keeps each case body free of brace-wrapping. The computation is cheap (an integer divide) so the marginal cost in the non-RayQuery modes is negligible. build_common.ps1: bump the vswhere version range from [16.0,18.0) to [16.0,19.0) so VS 2026 satisfies the lower-bound check while still rejecting older releases.
BinqAdams
force-pushed
the
refactor/c2360-workgroup-braces
branch
from
8c65bfd to
a253c52
Compare
BinqAdams
changed the title
Contributor
Author
|
@MarkEHenderson — apologies for the long delay on this. Force-pushed a rework that addresses your Feb feedback:
Smoke-built |
Collaborator
|
Just merged this internally, it should show up on github soon. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Allow DXVK Remix to build cleanly under MSVC 19.x (Visual Studio 2026) with
/WXenabled.Motivation
Three pathtracer dispatch sites declare
VkExtent3D workgroupsdirectly under acase:label inside a switch. MSVC 19.x emits C2360 / C2361 ("initialization ofworkgroupsis skipped bycaselabel") and, with/WX, the build aborts. The C++ rule is that a non-trivial initialization cannot be jumped over by other case labels in the same switch.build_common.ps1separately rejects VS 2026 because itsvswherequery is pinned to[16.0,18.0).What Changed
Hoist
const VkExtent3D workgroups = util::computeBlockCount(rayDims, VkExtent3D { 16, 8, 1 });above theswitchin three files:src/dxvk/rtx_render/rtx_pathtracer_gbuffer.cppsrc/dxvk/rtx_render/rtx_pathtracer_integrate_direct.cppsrc/dxvk/rtx_render/rtx_pathtracer_integrate_indirect.cppOnly the
RayQuerycase usesworkgroups(other modes calltraceRays); the value is the same expression in all three files. Hoisting kills C2360 / C2361 without adding brace-wrapping inside each case body. The marginal cost of computingworkgroupsin non-RayQuerymodes is an integer divide.Bump
build_common.ps1vswhereversion range from[16.0,18.0)to[16.0,19.0)so VS 2026 satisfies the lower-bound check while still rejecting older releases.Net diff: 4 files, +4 / -4.
Testing
Built
_Comp64DebugOptimizedend-to-end against VS 2026 + Vulkan SDK 1.4.x, ninja backend; producedd3d9.dlland ran install steps cleanly with no warnings or errors from any of the three modified pathtracer compilation units.