Merge fd9da517f2 into 133b19f205

rpcs3/Emu/RSX/NV47/HW/nv308a.cpp

@@ -93,9 +93,9 @@ namespace rsx
 					// Move last 32 bits
 					reinterpret_cast<u32*>(dst)[0] = reinterpret_cast<const u32*>(src)[count - 1];
 					RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 4);
+					return;
 				}
-				else
-				{
+
 				if (dst_dma & CELL_GCM_LOCATION_MAIN)
 				{
 					// May overlap
@@ -108,8 +108,6 @@ namespace rsx
 				}
 
 				RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 4);
-				}
-
 				break;
 			}
 			case blit_engine::transfer_destination_format::r5g6b5:

rpcs3/Emu/RSX/VK/vkutils/device.cpp

@@ -99,7 +99,7 @@ namespace vk
 		multidraw_support.max_batch_size = 65536;
 
 		optional_features_support.barycentric_coords  = !!shader_barycentric_info.fragmentShaderBarycentric;
-		optional_features_support.framebuffer_loops   = !!fbo_loops_info.attachmentFeedbackLoopLayout;
+		optional_features_support.framebuffer_loops   = !!fbo_loops_info.attachmentFeedbackLoopLayout && get_driver_vendor() != driver_vendor::AMD;
 		optional_features_support.extended_device_fault = !!device_fault_info.deviceFault;
 
 		features = features2.features;