vk: fix some validation errors

renderCompleteSemaphore must be indexed by currentImage because the
driver may return any image index when acquiring.
Transition the RTT depth buffer to correct layout after creation.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-**Please Note: This form is the minimum required information for submitting bugs.**  
-**Removing this form may lead to your issue being closed until it is completed.**
+<!-- Please Note: This form is the minimum required information for submitting bugs. -->
+<!-- Removing this form may lead to your issue being closed until it is completed. -->
 
 Platform / OS / Hardware: 
 
@@ -18,24 +18,23 @@ Hardware:
 
 **_Description of the Issue_**
 
-Add a short, concise description of the issue here
+<!-- Add a short, concise description of the issue here -->
 
 **_Debugging Steps Tested_**
 
-  * Fill in any steps already tried here
-  * Begin each new line with an asterisk
-  * If no steps are required, please skip
+  <!-- Fill in any steps already tried here -->
+  <!-- Begin each new line with an asterisk -->
+  <!--  If no steps are required, please skip -->
 
 **_Logs Gathered_**
 
 ```
-
 Please paste the contents of the log / logs here
-You may leave this field blank if you have none.
+Delete this field if you have none.
 
 ```
 
 
 **_Screenshots_**
 
-(Replace this line with any issue screenshots)
+<!-- Replace this line with any issue screenshots -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,13 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+## Description
+<!-- Summarize the change and its motivation. -->
+<!-- Use "Fixes #123" for an issue this PR closes, or "Related to #123" otherwise. -->
+
+## Checklist
+- [ ] This PR targets `dev`, unless it is a critical, low-risk bug fix.
+- [ ] I linked the relevant issue or discussion, if one exists.
+- [ ] I added or updated tests where appropriate.
+- [ ] I tested the change on the relevant platform(s) and noted any limitations.
+- [ ] For UI changes, I included screenshots or a recording where helpful.
+- [ ] I kept the change focused, followed existing project patterns and avoided code duplication.

.github/workflows/c-cpp.yml

@@ -36,7 +36,6 @@ jobs:
           brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
           brew update || :
           brew install libao ldid pulseaudio
-          brew uninstall --ignore-dependencies zstd
 
           moltenvk_tag="v1.4.2"
           moltenvk_root="$RUNNER_TEMP/MoltenVK-$moltenvk_tag"
@@ -106,6 +105,8 @@ jobs:
             fi
           done
           echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
+          # After the last brew download: brew's own curl links brew's zstd
+          brew uninstall --ignore-dependencies zstd
         if: matrix.config.name == 'apple-darwin'
 
       - uses: actions/cache@v6

core/cfg/option.cpp

@@ -110,6 +110,7 @@ Option<int64_t> PixelBufferSize("rend.PixelBufferSize", 512_MB);
 Option<int> AnisotropicFiltering("rend.AnisotropicFiltering", 1);
 Option<int> TextureFiltering("rend.TextureFiltering", 0); // Default
 Option<bool> ThreadedRendering("rend.ThreadedRendering", true);
+Option<bool> VblankPacing("");
 Option<bool> DupeFrames("rend.DupeFrames", false);
 Option<int> PerPixelLayers("rend.PerPixelLayers", 32);
 #ifdef TARGET_UWP

core/cfg/option.h

@@ -471,6 +471,7 @@ extern Option<int64_t> PixelBufferSize;
 extern Option<int> AnisotropicFiltering;
 extern Option<int> TextureFiltering; // 0: default, 1: force nearest, 2: force linear
 extern Option<bool> ThreadedRendering;
+extern Option<bool> VblankPacing;
 extern Option<bool> DupeFrames;
 extern Option<bool> NativeDepthInterpolation;
 extern Option<bool> EmulateFramebuffer;

core/emulator.cpp

@@ -238,6 +238,13 @@ static void loadSpecialSettings()
 		}
 		else
 			WARN_LOG(BOOT, "No region specified in IP.BIN");
+		// Broadcast left on Default follows the region, the way Region's own
+		// Default follows IP.BIN above: PAL for Europe, NTSC otherwise.
+		// fixUpDCFlash() skips the out-of-range Default value, which left the
+		// flash byte at the factory setting (NTSC) or at whatever the last
+		// explicit choice wrote.
+		if (config::Broadcast == 4)
+			config::Broadcast.override(config::Region == 2 ? 1 : 0);
 		if (config::Cable <= 1 && (!ip_meta.supportsVGA()
 				|| prod_id == "T-12504N"	// Caesar's Palace (NTSC)
 				|| prod_id == "12502D-50"))	// Caesar's Palace (PAL)
@@ -1088,7 +1095,7 @@ void Emulator::vblank()
 	EventManager::event(Event::VBlank);
 	runner.execTasks();
 	// Time out if a frame hasn't been rendered for 50 ms
-	if (sh4_sched_now64() - startTime <= 50_sh4ms)
+	if (!config::VblankPacing && sh4_sched_now64() - startTime <= 50_sh4ms)
 		return;
 	if (ggpo::active())
 		ggpo::endOfFrame();

core/hw/bba/bba.cpp

@@ -292,6 +292,8 @@ void pci_dma_write(PCIDevice *dev, dma_addr_t addr, const void *buf, dma_addr_t
 
 void bba_Serialize(Serializer& ser)
 {
+	if (rtl8139device == nullptr)
+		return;
 	ser << GAPS_regs;
 	ser << GAPS_ram;
 	ser << dmaOffset;
@@ -301,6 +303,8 @@ void bba_Serialize(Serializer& ser)
 
 void bba_Deserialize(Deserializer& deser)
 {
+	if (rtl8139device == nullptr)
+		return;
 	deser >> GAPS_regs;
 	deser >> GAPS_ram;
 	deser >> dmaOffset;

core/hw/pvr/Renderer_if.cpp

@@ -268,7 +268,7 @@ private:
 		if (renderer->Present())
 		{
 			presented = true;
-			if (!config::ThreadedRendering && !ggpo::active())
+			if (!config::ThreadedRendering && !config::VblankPacing && !ggpo::active())
 				emu.getSh4Executor()->Stop();
 #ifdef LIBRETRO
 			retro_rend_present();

core/hw/pvr/spg.cpp

@@ -42,7 +42,7 @@ static u32 lightgun_hpos;
 static bool maple_int_pending;
 
 #ifdef LIBRETRO
-extern bool retro_refresh_av_info(double fps);
+extern void retro_setfps(double fps);
 #endif
 
 void CalculateSync()
@@ -64,7 +64,7 @@ void CalculateSync()
 	sh4_sched_request(vblank_schid, Line_Cycles);
 
 #ifdef LIBRETRO
-	retro_refresh_av_info((double)SH4_MAIN_CLOCK / ((double)Line_Cycles * (double)pvr_numscanlines));
+	retro_setfps((double)SH4_MAIN_CLOCK / ((double)Line_Cycles * (double)pvr_numscanlines));
 #endif
 }
 

core/reios/gdrom_hle.cpp

@@ -187,7 +187,7 @@ static void readSectors(u32 addr, u32 sector, u32 count, bool virtualAddr)
 	gd_hle_state.cur_sector = sector + count - 1;
 	if (!virtualAddr || !mmu_enabled())
 	{
-		u8 * pDst = GetMemPtr(addr, 0);
+		u8 * pDst = GetMemPtr(addr, count * 2048);
 
 		if (pDst != NULL)
 		{

core/rend/vulkan/drawer.cpp

@@ -445,6 +445,8 @@ vk::CommandBuffer TextureDrawer::BeginRenderPass()
 		depthAttachment->Init(width, height, GetContext()->GetDepthFormat(),
 				vk::ImageUsageFlagBits::eDepthStencilAttachment | vk::ImageUsageFlagBits::eTransientAttachment,
 				"RTT DEPTH ATTACHMENT");
+		setImageLayout(commandBuffer, depthAttachment->GetImage(), GetContext()->GetDepthFormat(),
+				1, vk::ImageLayout::eUndefined, vk::ImageLayout::eDepthStencilAttachmentOptimal);
 	}
 	vk::Image colorImage;
 	vk::ImageView colorImageView;

core/rend/vulkan/vulkan_context.cpp

@@ -870,7 +870,7 @@ void VulkanContext::CreateSwapChain()
 	    		nullptr, nullptr);
 
 	    renderPass = device->createRenderPassUnique(vk::RenderPassCreateInfo(vk::RenderPassCreateFlags(),
-	    		attachmentDescription,	subpass));
+	    		attachmentDescription, subpass));
 
 	    // Framebuffers, fences, semaphores
 
@@ -882,13 +882,14 @@ void VulkanContext::CreateSwapChain()
 	    			view.get(), width, height, 1)));
 	    	drawFences.push_back(device->createFenceUnique(vk::FenceCreateInfo(vk::FenceCreateFlagBits::eSignaled)));
 	    }
-	    renderCompleteSemaphores.reserve(imageViews.size() + 1);
+	    // indexed with currentImage
+	    renderCompleteSemaphores.reserve(imageViews.size());
+	    for (unsigned i = 0; i < imageViews.size(); i++)
+	    	renderCompleteSemaphores.push_back(device->createSemaphoreUnique(vk::SemaphoreCreateInfo()));
+	    // indexed with currentSemaphore
 	    imageAcquiredSemaphores.reserve(imageViews.size() + 1);
 	    for (unsigned i = 0; i < imageViews.size() + 1; i++)
-	    {
-	    	renderCompleteSemaphores.push_back(device->createSemaphoreUnique(vk::SemaphoreCreateInfo()));
 	    	imageAcquiredSemaphores.push_back(device->createSemaphoreUnique(vk::SemaphoreCreateInfo()));
-	    }
 	    inFlightObjects.resize(imageViews.size());
 	    currentSemaphore = 0;
 	    quadPipeline->Init(shaderManager.get(), *renderPass, 0);
@@ -1032,9 +1033,10 @@ void VulkanContext::EndFrame(vk::CommandBuffer overlayCmdBuffer)
 	if (overlayCmdBuffer)
 		allCmdBuffers.push_back(overlayCmdBuffer);
 	allCmdBuffers.push_back(commandBuffer);
-	vk::SubmitInfo submitInfo(*imageAcquiredSemaphores[currentSemaphore], wait_stage, allCmdBuffers, *renderCompleteSemaphores[currentSemaphore]);
+	vk::SubmitInfo submitInfo(*imageAcquiredSemaphores[currentSemaphore], wait_stage, allCmdBuffers, *renderCompleteSemaphores[currentImage]);
 	device->resetFences(*drawFences[currentImage]);
 	graphicsQueue.submit(submitInfo, *drawFences[currentImage]);
+	currentSemaphore = (currentSemaphore + 1) % imageAcquiredSemaphores.size();
 	assert(rendering);
 	rendering = false;
 	renderDone = true;
@@ -1046,7 +1048,7 @@ void VulkanContext::Present() noexcept
 	{
 		try {
 			DoSwapAutomation();
-			vk::Result res = swappyvk::present(presentQueue, vk::PresentInfoKHR(1, &(*renderCompleteSemaphores[currentSemaphore]), 1, &(*swapChain), &currentImage));
+			vk::Result res = swappyvk::present(presentQueue, vk::PresentInfoKHR(1, &(*renderCompleteSemaphores[currentImage]), 1, &(*swapChain), &currentImage));
 #if defined(VK_USE_PLATFORM_METAL_EXT) || defined(__APPLE__)
 			// presentKHR lists eSuboptimalKHR as a success code so it is
 			// returned rather than thrown. Treat it as a request to
@@ -1059,25 +1061,19 @@ void VulkanContext::Present() noexcept
 			if (res == vk::Result::eSuboptimalKHR)
 				resized = true;
 #endif
-			currentSemaphore = (currentSemaphore + 1) % renderCompleteSemaphores.size();
 #ifndef SWAPPY
 			if (lastFrameView && IsValid() && !gui_is_open()
 					&& swapOnVSync && config::DupeFrames)
 			{
 				const int interval = swapInterval * gameSwapInterval;
-				for (int i = 1; i < interval; i++)
+				for (int i = 1; i < interval && !resized; i++)
 				{
 					PresentFrame(vk::Image(), lastFrameView, lastFrameExtent, lastFrameAR);
-					res = presentQueue.presentKHR(vk::PresentInfoKHR(1, &(*renderCompleteSemaphores[currentSemaphore]), 1, &(*swapChain), &currentImage));
-					currentSemaphore = (currentSemaphore + 1) % renderCompleteSemaphores.size();
+					res = presentQueue.presentKHR(vk::PresentInfoKHR(1, &(*renderCompleteSemaphores[currentImage]), 1, &(*swapChain), &currentImage));
+#if defined(VK_USE_PLATFORM_METAL_EXT) || defined(__APPLE__)
 					if (res == vk::Result::eSuboptimalKHR)
-					{
-						// Stop queuing additional dupe presents into a swap
-						// chain that we are about to tear down: the extra
-						// in-flight semaphores would just delay waitIdle().
 						resized = true;
-						break;
-					}
+#endif
 				}
 			}
 #endif

shell/libretro/libretro.cpp

@@ -764,16 +764,19 @@ bool setAVInfo(retro_system_av_info& avinfo)
 	return true;
 }
 
-bool retro_refresh_av_info(double fps)
+void retro_setfps(double fps)
+{
+	if (fps > 0 && fps < 100)
+		fps_spg = fps;
+}
+
+static bool retro_refresh_av_info()
 {
 	retro_system_av_info avinfo;
 
 	if (first_run || game_data.empty())
 		return false;
 
-	if (fps > 0 && fps < 100)
-		fps_spg = fps;
-
 	if (setAVInfo(avinfo))
 	{
 		environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &avinfo);
@@ -805,7 +808,7 @@ void retro_resize_renderer(int w, int h, float aspectRatio)
 	else
 	{
 		// Check if timing change is needed instead
-		if (retro_refresh_av_info(0))
+		if (retro_refresh_av_info())
 			return;
 
 		retro_game_geometry geometry;
@@ -2886,7 +2889,7 @@ static void updateLightgunCoordinates(u32 port)
 	lightgun_params[port].y = mo_y_abs[port];
 }
 
-void updateLightgunCoordinatesFromAnalogStick(int port)
+static void updateLightgunCoordinatesFromAnalogStick(int port)
 {
 	int x = input_cb(port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X);
 	mo_x_abs[port] = 320 + x * 320 / 32767;

shell/libretro/libretro_core_options.h

@@ -644,6 +644,20 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "enabled",
    },
+   {
+      CORE_OPTION_NAME "_vblank_pacing",
+      "Vblank Pacing",
+      NULL,
+      "Each frame the frontend runs emulates exactly one vblank, whether or not the game drew. For frontends that pace the core by its frame rate rather than by blocking on audio; without it, loading screens that draw nothing run several vblanks per frame and their sound arrives in bursts. Needs Threaded Rendering disabled.",
+      NULL,
+      "performance",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
    {
       CORE_OPTION_NAME "_auto_skip_frame",
       "Auto Skip Frame",

shell/libretro/option.cpp

@@ -89,6 +89,7 @@ Option<bool> IntegerScale("");
 Option<bool> LinearInterpolation("", true);
 Option<bool> VSync("", true);
 Option<bool> ThreadedRendering(CORE_OPTION_NAME "_threaded_rendering", true);
+Option<bool> VblankPacing(CORE_OPTION_NAME "_vblank_pacing");
 Option<int> AnisotropicFiltering(CORE_OPTION_NAME "_anisotropic_filtering");
 Option<int> TextureFiltering(CORE_OPTION_NAME "_texture_filtering");
 Option<bool> PowerVR2Filter(CORE_OPTION_NAME "_pvr2_filtering");

shell/libretro/option_lr.h

@@ -59,7 +59,7 @@ private:
 	std::vector<BaseOption *> options;
 	std::string gameId;
 	retro_environment_t retroEnv = nullptr;
-	const retro_core_option_v2_definition *optionDefs;
+	const retro_core_option_v2_definition *optionDefs = nullptr;
 
 	template<typename T, bool>
 	friend class Option;