Merge branch 'main' into Breakpoints-improvements

Author: nicolasnoble

src/mips/psyqo/gpu.hh

@@ -123,9 +123,13 @@ class GPU {
      * @details This returns the internal frame counter being kept by the
      * GPU class. The 32 bits value will wrap around when it reaches 2^32
      * frames, which is 2 years, 3 months, 7 days, 6 hours, 6 minutes and
-     * 28.27 seconds when running constantly at a 60Hz refresh rate.
+     * 28.27 seconds when running constantly at a 60Hz refresh rate. This
+     * counter will be incremented during the frame flip operation by the
+     * appropriate number of hardware frames which have passed since the
+     * last frame flip. In other words, this counter monotonically increases
+     * by one for each vsync event that occurred during the last rendering.
      */
-    uint32_t getFrameCount() const { return m_frameCount; }
+    uint32_t getFrameCount() const { return m_previousFrameCount; }
 
     /**
      * @brief Get the index of the current display buffer.

third_party/EASTL/include/EASTL/variant.h

@@ -637,10 +637,10 @@ namespace eastl
 	///////////////////////////////////////////////////////////////////////////
 	// 20.7.4, value access
 	//
-	template <class T, class... Types, ssize_t I = meta::get_type_index_v<T, Types...>>
+	template <class T, class... Types, EASTL_SSIZE_T I = meta::get_type_index_v<T, Types...>>
 	EA_CONSTEXPR bool holds_alternative(const variant<Types...>& v) EA_NOEXCEPT
 	{
-		// ssize_t template parameter because the value can be negative
+		// EASTL_SSIZE_T template parameter because the value can be negative
 		return I == variant_npos ? false : (v.index() == I);
 	}
 
@@ -858,7 +858,7 @@ namespace eastl
 		//
 		template <class T,
 		          typename T_j = meta::overload_resolution_t<T, meta::overload_set<Types...>>,
-		          ssize_t I = meta::get_type_index_v<decay_t<T_j>, Types...>,
+		          EASTL_SSIZE_T I = meta::get_type_index_v<decay_t<T_j>, Types...>,
 		          typename = enable_if_t<!eastl::is_same_v<decay_t<T>, variant> && eastl::is_assignable_v<T_j&, T> &&
 		                                 eastl::is_constructible_v<T_j, T>>>
 		EA_CPP14_CONSTEXPR variant& operator=(T&& t)