Skip to content

Update to plume backed RT64 #25

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

Draft
dcvz wants to merge 2 commits into
base: main
Choose a base branch
from
+131 −130
Draft

Update to plume backed RT64 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e3ca26
Update to plume backed RT64
dcvz Aug 5, 2025
35e4018
Update RT64
dcvz Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ target_include_directories(MarioKart64Recompiled PRIVATE
${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/inc
${CMAKE_SOURCE_DIR}/lib/rt64/src
${CMAKE_SOURCE_DIR}/lib/rt64/src/rhi
${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/plume
${CMAKE_SOURCE_DIR}/lib/rt64/src/render
${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include
${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include
Expand Down
2 changes: 1 addition & 1 deletion lib/rt64
Open in desktop
Submodule rt64 updated 74 files
+1 −0 .gitignore
+3 −0 .gitmodules
+8 −40 CMakeLists.txt
+10 −10 README.md
+0 −33 examples/rhi_test.cpp
+0 −1,575 examples/rt64_render_interface.cpp
+0 −52 examples/shaders/RenderInterfaceTestAsyncCS.hlsl
+0 −26 examples/shaders/RenderInterfaceTestCS.hlsl
+0 −21 examples/shaders/RenderInterfaceTestColorPS.hlsl
+0 −14 examples/shaders/RenderInterfaceTestDecalPS.hlsl
+0 −11 examples/shaders/RenderInterfaceTestPostPS.hlsl
+0 −9 examples/shaders/RenderInterfaceTestPostVS.hlsl
+0 −44 examples/shaders/RenderInterfaceTestRT.hlsl
+0 −7 examples/shaders/RenderInterfaceTestSpecPS.hlsl
+0 −18 examples/shaders/RenderInterfaceTestTextureBindfulPS.hlsl
+0 −19 examples/shaders/RenderInterfaceTestTextureBindlessPS.hlsl
+0 −8 examples/shaders/RenderInterfaceTestVS.hlsl
+6 −31 include/rt64_extended_gbi.h
+0 −31 src/apple/rt64_apple.h
+0 −118 src/apple/rt64_apple.mm
+5 −0 src/common/rt64_plume.h
+6 −0 src/common/rt64_profiling_timer.cpp
+1 −0 src/common/rt64_profiling_timer.h
+1 −0 src/contrib/plume
+0 −3,664 src/d3d12/rt64_d3d12.cpp
+0 −453 src/d3d12/rt64_d3d12.h
+1 −18 src/gbi/rt64_gbi_extended.cpp
+32 −3 src/gbi/rt64_gbi_f3d.cpp
+1 −8 src/gbi/rt64_gbi_f3dex2.cpp
+1 −3 src/gui/rt64_debugger_inspector.cpp
+0 −1 src/gui/rt64_file_dialog.cpp
+4 −3 src/gui/rt64_file_dialog.h
+7 −7 src/gui/rt64_inspector.cpp
+2 −2 src/gui/rt64_inspector.h
+9 −5 src/hle/rt64_application.cpp
+2 −2 src/hle/rt64_application.h
+2 −1 src/hle/rt64_application_window.h
+0 −3 src/hle/rt64_game_frame.cpp
+0 −1 src/hle/rt64_game_frame.h
+1 −1 src/hle/rt64_present_queue.cpp
+6 −12 src/hle/rt64_rdp.cpp
+8 −65 src/hle/rt64_rsp.cpp
+2 −13 src/hle/rt64_rsp.h
+10 −5 src/hle/rt64_state.cpp
+0 −1 src/hle/rt64_transform_group.h
+0 −5 src/hle/rt64_workload.cpp
+0 −1 src/hle/rt64_workload.h
+13 −4 src/hle/rt64_workload_queue.cpp
+3 −1 src/hle/rt64_workload_queue.h
+0 −3,273 src/metal/rt64_metal.cpp
+0 −618 src/metal/rt64_metal.h
+3 −1 src/preset/rt64_preset_inspector.h
+2 −1 src/render/rt64_buffer_uploader.h
+2 −2 src/render/rt64_descriptor_sets.h
+29 −46 src/render/rt64_framebuffer_renderer.cpp
+28 −35 src/render/rt64_projection_processor.cpp
+1 −1 src/render/rt64_projection_processor.h
+2 −2 src/render/rt64_raster_shader.h
+1 −1 src/render/rt64_render_worker.cpp
+2 −2 src/render/rt64_render_worker.h
+2 −2 src/render/rt64_sampler_library.h
+2 −2 src/render/rt64_shader_common.h
+1 −1 src/render/rt64_shader_compiler.h
+2 −2 src/render/rt64_shader_library.h
+2 −2 src/render/rt64_texture.h
+4 −1 src/render/rt64_texture_cache.cpp
+2 −1 src/render/rt64_upscaler.h
+2 −2 src/rhi/rt64_render_hooks.h
+0 −244 src/rhi/rt64_render_interface.h
+0 −261 src/rhi/rt64_render_interface_builders.h
+0 −1,760 src/rhi/rt64_render_interface_types.h
+7 −6 src/shared/rt64_rsp_viewport.h
+0 −4,222 src/vulkan/rt64_vulkan.cpp
+0 −427 src/vulkan/rt64_vulkan.h
14 changes: 7 additions & 7 deletions src/main/rt64_render_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ unsigned int VI_Y_SCALE_REG = 0;

void dummy_check_interrupts() {}

RT64::UserConfiguration::Antialiasing compute_max_supported_aa(RT64::RenderSampleCounts bits) {
if (bits & RT64::RenderSampleCount::Bits::COUNT_2) {
if (bits & RT64::RenderSampleCount::Bits::COUNT_4) {
if (bits & RT64::RenderSampleCount::Bits::COUNT_8) {
RT64::UserConfiguration::Antialiasing compute_max_supported_aa(plume::RenderSampleCounts bits) {
if (bits & plume::RenderSampleCount::Bits::COUNT_2) {
if (bits & plume::RenderSampleCount::Bits::COUNT_4) {
if (bits & plume::RenderSampleCount::Bits::COUNT_8) {
return RT64::UserConfiguration::Antialiasing::MSAA8X;
}
return RT64::UserConfiguration::Antialiasing::MSAA4X;
Expand Down Expand Up @@ -315,9 +315,9 @@ zelda64::renderer::RT64Context::RT64Context(uint8_t* rdram, ultramodern::rendere
// Check if the selected device actually supports MSAA sample positions and MSAA for for the formats that will be used
// and downgrade the configuration accordingly.
if (app->device->getCapabilities().sampleLocations) {
RT64::RenderSampleCounts color_sample_counts = app->device->getSampleCountsSupported(RT64::RenderFormat::R8G8B8A8_UNORM);
RT64::RenderSampleCounts depth_sample_counts = app->device->getSampleCountsSupported(RT64::RenderFormat::D32_FLOAT);
RT64::RenderSampleCounts common_sample_counts = color_sample_counts & depth_sample_counts;
plume::RenderSampleCounts color_sample_counts = app->device->getSampleCountsSupported(plume::RenderFormat::R8G8B8A8_UNORM);
plume::RenderSampleCounts depth_sample_counts = app->device->getSampleCountsSupported(plume::RenderFormat::D32_FLOAT);
plume::RenderSampleCounts common_sample_counts = color_sample_counts & depth_sample_counts;
device_max_msaa = compute_max_supported_aa(common_sample_counts);
sample_positions_supported = true;
}
Expand Down
Loading
Loading