fix(agc): pass the tile mode of a mismatched depth plane copy as an int by milescoviello · Pull Request #7504 · boykopovar/AnyPS5

milescoviello · 2026-10-18T09:56:59Z

What

The error for a depth plane copy whose geometry doesn't match its layers (DepthSurface.cpp) passed resource.tileMode, a TextureTileMode enum class, straight to a %u conversion. A scoped enumeration isn't promoted in a variadic call, so the conversion doesn't match its argument. GCC 13 warns about it in every build:

core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp:868:214: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 12 has type ‘const AgcDriver::Graphics::TextureTileMode’ [-Wformat=]

It is now cast to int and printed with %d, as the replaced-view error in the same file already prints it. (The storage image access error casts to unsigned and prints %u; either cast fixes the mismatch.) On current main the message is at DepthSurface.cpp:1561.

Tested

Ubuntu 24.04 (Linux 6.8), GCC 13.3, NVIDIA RTX 4070 Ti, driver 595.99.02.

cmake --build build: the warning above is gone, and DepthSurface.cpp builds without warnings.
ctest -R "agc_driver_depth|native_depth|depth_plane|depth_storage": 19/19 pass. No test reaches this error (it fires only on a geometry mismatch), so there's no red/green test. The change only touches the message's arguments.
tools/check_conventions.py --base upstream/main passes. tools/pr_overlap.py lists only conflicting PRs that it could not compare on DepthSurface.cpp, and none of their diffs touch this message.
@wachi35676 tested 352f6236c. On WSL Ubuntu 24.04 with GCC 13.3, main prints the -Wformat warning at DepthSurface.cpp:868 and this PR builds the object without warnings. MinGW GCC 15.2 gives no warning either way. The 19 agc_driver_depth|native_depth|depth_plane|depth_storage tests pass on an RTX 5070 Ti (617.42) and an AMD Radeon iGPU (32.0.21042.62).
Windows, Intel and AMD: @savvaniss ran the full CTest (1,526 tests, Windows 11 Pro 26300, WinLibs GCC 15.2.0 r7, Intel UHD 770 and AMD RX 9070 XT) with head 352f623 merged into main 0737757, alone and together with 13 other open AGC and shader PRs. Neither GPU fails anything beyond main's own failures on that machine.
Khronos validation layer (LunarG SDK 1.4.363), NVIDIA RTX 4070 Ti (595.99.02), Ubuntu 24.04: VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation ANYPS5_NO_SHADER_CACHE=1 ANYPS5_REQUIRE_VULKAN=1 ctest -R '^agc_' -V on main e2a2914 and on main + this PR (352f623, a local merge). main: 815 of 815 pass; with this PR: 815 of 815 pass. Neither log reports the layer missing. VUIDs on main: VUID-VkImageViewCreateInfo-usage-02275 ×6, VUID-VkPipelineColorBlendStateCreateInfo-pAttachments-00605 ×18, VUID-vkCmdCopyBuffer-srcBuffer-00118 ×2, VUID-vkCmdDraw-multisampledRenderToSingleSampled-07285 ×2, VUID-vkCmdWaitEvents-srcStageMask-01158 ×2, VUID-vkSetEvent-event-09543 ×2; with this PR: VUID-VkImageViewCreateInfo-usage-02275 ×6, VUID-VkPipelineColorBlendStateCreateInfo-pAttachments-00605 ×18, VUID-vkCmdCopyBuffer-srcBuffer-00118 ×2, VUID-vkCmdDraw-multisampledRenderToSingleSampled-07285 ×2, VUID-vkCmdWaitEvents-srcStageMask-01158 ×2, VUID-vkSetEvent-event-09543 ×2. None is new with this PR.

Checklist

🤖 Generated with Claude Code

The error for a depth plane copy whose geometry does not match its layers passed the TextureTileMode enum class straight to a %u conversion. GCC warns about it (-Wformat), and a scoped enumeration is not promoted in a variadic call. Cast it to int and print it with %d, as the two other tile mode messages in DepthSurface.cpp already do. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

github-actions · 2026-10-18T10:31:44Z

Some comparisons could not be completed because a pull request conflicts with the base branch. Review these shared files manually before concluding that there is no overlap.

Pull request	Shared files not compared
PR 1368	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 1395	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 6808	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 7256	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 7449	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 7642	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 9672	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 9895	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 9950	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 10193	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 10249	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 10256	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 11444	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 11998	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 12120	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 13863	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 13920	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 13928	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 13929	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 14005	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 14344	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`
PR 15059	`core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp`

wachi35676 · 2026-10-19T00:13:22Z

Tested at 352f6236c.

WSL Ubuntu 24.04, GCC 13.3.0, main 9f25d0bf5: building DepthSurface.cpp.o prints DepthSurface.cpp:868:214: warning: format '%u' expects argument of type 'unsigned int', but argument 12 has type 'const AgcDriver::Graphics::TextureTileMode' [-Wformat=]. With this PR merged, the object builds with no warnings.
Windows, MinGW GCC 15.2.0: no warning either way.
The 19 agc_driver_depth|native_depth|depth_plane|depth_storage tests pass on an RTX 5070 Ti (617.42) and an AMD Radeon iGPU (32.0.21042.62).

AI-assisted: yes (Claude Code); results above were run on this machine.

milescoviello · 2026-10-19T01:06:14Z

Thanks @wachi35676 for checking the warning on both toolchains and running the depth tests on two GPUs. Added to the description.

AI-assisted: yes (Claude Code)

savvaniss · 2026-10-19T06:35:46Z

Windows regression check on an Intel UHD 770 and an AMD RX 9070 XT: no change in the full CTest results.

Windows 11 Pro 26300, WinLibs GCC 15.2.0 r7, Release, every execution test built, ANYPS5_NO_SHADER_CACHE=1, serial CTest. Intel UHD Graphics 770 (8086:a780), driver 32.0.101.7088. AMD Radeon RX 9070 XT (1002:7550), driver 32.0.31041.1004, with VkCache emptied first. This head 352f6236c merged into main 07377573f.

This PR adds no test. Full CTest (--parallel 4, 1526 tests) with this head merged fails the same tests as main alone on this machine: the five image-table tests (#6647) and agc_driver_sample_multisample_target (#6957) on the UHD 770, and agc_driver_layered_volume_vertex_no_gpl (#4768) on the RX 9070 XT.

I also ran full CTest with this PR and the 13 other open AGC and shader PRs I tested in the same batch merged together (#7668, #7659, #7432, #7426, #7413, #7480, #7465, #7466, #7464, #7449, #7489, #7673, #7560). Neither GPU showed a failure beyond main's own: the five image-table tests (#6647) and agc_driver_sample_multisample_target (#6957) on the UHD 770, and agc_driver_layered_volume_vertex_no_gpl (#4768) on the RX 9070 XT.

AI-assisted: yes (Claude Code)

milescoviello · 2026-10-19T06:54:03Z

@savvaniss thanks for the full CTest on both GPUs, alone and in the 14-PR batch. It's in the description now.

AI-assisted: yes (Claude Code)

TechLevelZero · 2026-10-29T23:56:24Z

✅ NVIDIA GPU test: passed

PR head 352f623 merged onto main 88e804b · tested 2026-11-02 15:10 UTC · 21 min


GPU	NVIDIA RTX 2000 Ada Generation, driver 595.99.02, Vulkan 1.4.329
Host	Ubuntu 26.04.1 LTS, kernel 7.0.0-38-generic, container ubuntu:24.04
Logs	build and test logs for this run
Build	✅ passed (Release, `-DANYPS5_ENABLE_SPIRV_TOOLS=ON`)
Tests	✅ 2,495 passed · 6 failed (0 new, 3 also fail on main, 3 unstable on main) · 45 skipped (`ANYPS5_REQUIRE_VULKAN=1`)
Test setup	CPU-only tests without a GPU; GPU tests (and any CPU-only test that failed or skipped without one) once on the GPU with `VK_LAYER_KHRONOS_validation` and `ANYPS5_NO_SHADER_CACHE=1`; main ran the same way
Test selection	2,546 of 3,234 tests run: the ones this change can reach, chosen by `tools/select_tests.py` from main's build graph
Vulkan validation	✅ no new validation IDs vs main (970 tests run on the GPU)
Slow tests (>30 s, GPU tests timed with validation layers)	⚠️ `agc_driver_pipeline_journal` 120.1 s, ⚠️ `agc_driver_graphics_maps_fallback` 32.4 s, ⚠️ `agc_driver_graphics` 31.5 s

Unstable on main (3, these also failed in recent main runs on this machine; not counted against this PR)

agc_driver_pipeline_journal: failed in 2 of the last 10 main runs
agc_submit_progress: failed in 8 of the last 10 main runs
agc_submit_progress_no_timeline: failed in 8 of the last 10 main runs

Failing on main too (3, not counted against this PR)

agc_driver_image_table
guest_mmap_executable
guest_socket_options_multicast

Validation IDs already present on main (4 IDs in 495 tests)

VUID-VkDeviceCreateInfo-pNext-pNext (495 tests): agc_driver, agc_driver_address_passes, agc_driver_alias_copy_label, agc_driver_alpha_to_coverage, agc_driver_array_layer_target, agc_driver_bc_block_copy, agc_driver_bda_anchor_reads, agc_driver_bda_span_reads, and 487 more
VUID-vkCmdCopyImage-srcImage-01548 (7 tests): agc_driver_depth_clear_hle, agc_driver_depth_plane_buffer_memory, agc_driver_depth_plane_partial_store, agc_driver_depth_plane_sampling, agc_driver_depth_storage_dispatch, agc_driver_depth_surface_from_storage, agc_driver_dispatch_move_depth
VUID-vkCmdCopyImage-srcImage-01551 (7 tests): agc_driver_depth_clear_hle, agc_driver_depth_plane_buffer_memory, agc_driver_depth_plane_partial_store, agc_driver_depth_plane_sampling, agc_driver_depth_storage_dispatch, agc_driver_depth_surface_from_storage, agc_driver_dispatch_move_depth
VUID-VkShaderModuleCreateInfo-pCode-08737 (1 test): agc_driver_image_sample_derivatives

Skipped (45)

agc_driver_bda_reads_shadowed_results: skipped, the device reports watched host memory written when it imports or reads it
agc_driver_bda_reads_shadowed_results_per_build: skipped, the device reports watched host memory written when it imports or reads it
agc_driver_sample_order_grid_reference: skipped, the device does not keep depth drawn at custom sample locations at those locations, even after a transition that names them: the composite of uniform renders holds the guest's depth in 0 of 3005 sloped samples, so no path can be compared with it bit for bit
agc_host_import_sparse: skipped, host imports are unavailable: /dev/udmabuf is not accessible
agc_import_settle_initial_dcc: skipped, the device has no deferred settle of host imports: imports under 1 MiB wait for one only on Windows
agc_unit_shadow_completion_store: skipped, the device reports watched host memory written when it imports or reads it
guest_http_uri_locale: 
guest_net_ctl: skipped, the host has no IPv4 address
guest_video_out_color_space: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
guest_video_out_hdr: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
guest_video_out_high_frame_rate: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
guest_video_out_output_mode: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
guest_video_out_resolution_status: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
guest_video_out_wqhd_detection: skipped, no display or Vulkan device: SDL_InitSubSystem(VIDEO | GAMECONTROLLER) failed: wayland,x11 not available
video_out_flip_aftergpu: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_backtoback: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_controls: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_cpuflip: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_cpuflip_in_order: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_dcc: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_deferred: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_eop: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_eop_aftergpu: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_eop_main: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_out_flip_fps_limit: skipped, no display or Vulkan device: DisplayWindow: Vulkan support is either not configured in SDL or not available in current SDL video driver (offscreen) or platform
video_o

Reproduce

git fetch origin 352f6236cc0c900a92e19f984a2bd3bb2ed5a162 88e804b0a7df1f1ac373a9e2f72fb378d925fdd4
git checkout 88e804b0a7df1f1ac373a9e2f72fb378d925fdd4 && git merge --no-ff 352f6236cc0c900a92e19f984a2bd3bb2ed5a162
git submodule update --init --recursive
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DANYPS5_ENABLE_SPIRV_TOOLS=ON
cmake --build build && cmake --build build --target libs
VK_DRIVER_FILES=/nonexistent/icd.json ctest --test-dir build -E '^(agc|shader|recompiler|videoout|video_out|guest_video_out|vulkan)|gpu' --timeout 120 --parallel 32 --output-on-failure
ANYPS5_REQUIRE_VULKAN=1 ANYPS5_NO_SHADER_CACHE=1 VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation \
  ctest --test-dir build -R '^(agc|shader|recompiler|videoout|video_out|guest_video_out|vulkan)|gpu' --timeout 120 --parallel 4 --output-on-failure
# failures are then re-run alone: --timeout 360 --parallel 2; new validation IDs: the test alone, twice, --parallel 1

_{Automated build and test on a contributor's NVIDIA machine; it does not replace upstream CI. A new comment is posted for each new push. Full logs.}

BunnyFl

Still needed on current main f6232fcfda: the message moved to core/libs/prx/libSceAgcDriver/Graphics/src/DepthSurface.cpp:1561, and it still passes resource.tileMode (a TextureTileMode scoped enum) to %u. The PR merges cleanly.

Windows 11, WinLibs GCC 15.2.0: the merged DepthSurface.cpp compiles with no warnings. This build passes no -W flags for that file (ninja -t commands for its object). In a separate two-line file, GCC 15.2 with -Wall reports format '%u' expects argument of type 'unsigned int', but argument 4 has type 'E' [-Wformat=] for a scoped enum passed to %u, the same diagnostic you saw with GCC 13.

A wording nit for the description: on current main only the replaced-view message (:869) prints the tile mode as static_cast<int> with %d. The storage-access one (:612) uses static_cast<unsigned> with %u. Either cast fixes the mismatch.

milescoviello · 2026-11-03T04:53:50Z

@BunnyFl thanks for checking it on current main and with GCC 15.2. You're right about the wording: only the replaced-view message casts to int with %d, and the storage-access one casts to unsigned with %u. I've corrected that sentence in the description and noted the message's current location (DepthSurface.cpp:1561). The code is unchanged.

AI-assisted: yes (Claude Code)

github-actions Bot added the agc libSceAgc* label Oct 18, 2026

This was referenced Oct 18, 2026

perf(shader): keep one use list per IR value #7520

Merged

fix: clear GCC warnings in the AGC driver and two tests #7555

Merged

AnthonyClemens mentioned this pull request Oct 19, 2026

fix(agc): bound the sampled depth-plane copies #7705

Merged

12 tasks done

This was referenced Oct 19, 2026

fix(agc): offset the CMASK of a plain color target slice by its slice #7668

Open

fix(agc): start DB_Z_INFO and DB_STENCIL_INFO at their clear-state value #7659

Merged

adriadam10 self-assigned this Oct 19, 2026

zoelmoj mentioned this pull request Oct 23, 2026

fix: define decoded AGC state and bound size arithmetic #10249

Open

12 tasks done

BunnyFl approved these changes Nov 3, 2026

View reviewed changes

Navigation Menu

Repository navigation

fix(agc): pass the tile mode of a mismatched depth plane copy as an int - #7504

fix(agc): pass the tile mode of a mismatched depth plane copy as an int#7504
milescoviello wants to merge 1 commit into
boykopovar:mainfrom
milescoviello:fix/depth-copy-tile-mode-format

milescoviello commented Oct 18, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Oct 18, 2026 •

edited

Loading

Uh oh!

wachi35676 commented Oct 19, 2026

Uh oh!

milescoviello commented Oct 19, 2026

Uh oh!

savvaniss commented Oct 19, 2026

Uh oh!

milescoviello commented Oct 19, 2026

Uh oh!

TechLevelZero commented Oct 29, 2026 •

edited

Loading

Uh oh!

BunnyFl left a comment

Uh oh!

milescoviello commented Nov 3, 2026

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

milescoviello commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Tested

Checklist

Uh oh!

github-actions Bot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wachi35676 commented Oct 19, 2026

Uh oh!

milescoviello commented Oct 19, 2026

Uh oh!

savvaniss commented Oct 19, 2026

Uh oh!

milescoviello commented Oct 19, 2026

Uh oh!

TechLevelZero commented Oct 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ NVIDIA GPU test: passed

Uh oh!

BunnyFl left a comment

Choose a reason for hiding this comment

Uh oh!

milescoviello commented Nov 3, 2026

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

milescoviello commented Oct 18, 2026 •

edited

Loading

github-actions Bot commented Oct 18, 2026 •

edited

Loading

TechLevelZero commented Oct 29, 2026 •

edited

Loading