Some tweaks for rmv:

- Update the BUILD.md file to fix inconsistencies in the Windows pre-build options.
- Add an option in Settings to toggle between KB and KiB units for size display.
- Add "Dimension", "MipLevel" and "Format" columns in the Resource list for Textures, DepthStencils and RenderTargets.
- Add a button to export all resource details from the Resource list.

Author: yifeidong

BUILD.md

@@ -36,8 +36,9 @@ This can be installed once Python is installed, as follows:
 Run the python pre_build.py script in the build folder from a command prompt. If no command line options are provided, the defaults will be used (Qt 6.7.0 and Visual Studio 2022)
 
 Some useful options of the pre_build.py script:
-* --vs <Visual Studio version>: generate the solution files for a specific Visual Studio version. For example, to target Visual Studio 2017, add --vs 2017 to the command.
-* --qt <path>: full path to the folder from where you would like the Qt binaries to be retrieved. By default, CMake would try to auto-detect Qt on the system.
+* --vs \<Visual Studio version\>: generate the solution files for a specific Visual Studio version. For example, to target Visual Studio 2017, add --vs 2017 to the command.
+* --qt \<QT Version\>: specify the version of QT to be used with the script (default: 6.7.0).
+* --qt-root \<path\>: full path to the folder from where you would like the Qt binaries to be retrieved. By default, CMake would try to auto-detect Qt on the system.
 
 Once the script has finished, in the case of Visual Studio 2019, a sub-folder called 'vs2019' will be created containing the necessary build files.
 Go into the 'vs2019' folder (build/win/vs2019) and double click on the RMV.sln file and build the 64-bit Debug and Release builds.

source/frontend/models/proxy_models/resource_proxy_model.cpp

@@ -34,13 +34,16 @@ namespace rmv
         setSourceModel(model);
         SetFilterKeyColumns({kResourceColumnName,
                              kResourceColumnVirtualAddress,
+                             kResourceColumnUsage,
+                             kResourceColumnDimension,
+                             kResourceColumnMipLevel,
+                             kResourceColumnFormat,
                              kResourceColumnSize,
                              kResourceColumnMappedInvisible,
                              kResourceColumnMappedLocal,
                              kResourceColumnMappedHost,
                              kResourceColumnMappedNone,
-                             kResourceColumnPreferredHeap,
-                             kResourceColumnUsage});
+                             kResourceColumnPreferredHeap});
 
         view->setModel(this);
         return model;
@@ -161,6 +164,48 @@ namespace rmv
             }
             return left_data < right_data;
         }
+        else if ((left.column() == kResourceColumnDimension && right.column() == kResourceColumnDimension))
+        {
+            const QList<QVariant> left_data  = left.data(Qt::UserRole).toList();
+            const QList<QVariant> right_data = right.data(Qt::UserRole).toList();
+            if (left_data == right_data)
+            {
+                return SortIdentical(left, right);
+            }
+
+            qlonglong left_pixels = 1;
+            qlonglong right_pixels = 1;
+            for (const QVariant& data : left_data)
+            {
+                left_pixels *= data.toInt();
+            }
+            for (const QVariant& data : right_data)
+            {
+                right_pixels *= data.toInt();
+            }
+
+            return left_pixels < right_pixels;
+        }
+        else if ((left.column() == kResourceColumnMipLevel && right.column() == kResourceColumnMipLevel))
+        {
+            const int left_data  = left.data(Qt::UserRole).toInt();
+            const int right_data = right.data(Qt::UserRole).toInt();
+            if (left_data == right_data)
+            {
+                return SortIdentical(left, right);
+            }
+            return left_data < right_data;
+        }
+        else if ((left.column() == kResourceColumnFormat && right.column() == kResourceColumnFormat))
+        {
+            const QString left_data  = left.data(Qt::UserRole).toString();
+            const QString right_data = right.data(Qt::UserRole).toString();
+            if (left_data == right_data)
+            {
+                return SortIdentical(left, right);
+            }
+            return left_data < right_data;
+        }
         else if ((left.column() == kResourceColumnSize && right.column() == kResourceColumnSize))
         {
             const qulonglong left_data  = left.data(Qt::UserRole).toULongLong();

source/frontend/models/proxy_models/table_proxy_model.cpp

@@ -62,6 +62,19 @@ namespace rmv
         return out;
     }
 
+    QString TableProxyModel::GetDataAsStr(int row, int column)
+    {
+        QString out("null");
+
+        const QModelIndex model_index = index(row, column, QModelIndex());
+
+        if (model_index.isValid() == true)
+        {
+            out = data(model_index, Qt::DisplayRole).toString();
+        }
+        return out;
+    }
+
     QModelIndex TableProxyModel::FindModelIndex(qulonglong lookup, int column) const
     {
         QModelIndex out_model_index;

source/frontend/models/proxy_models/table_proxy_model.h

@@ -52,6 +52,14 @@ namespace rmv
         /// @return The contents at row, column.
         qulonglong GetData(int row, int column);
 
+        /// @brief Get content from proxy model.
+        ///
+        /// @param [in] row    The row where the data is located.
+        /// @param [in] column The column where the data is located.
+        ///
+        /// @return The string contents at row, column.
+        QString GetDataAsStr(int row, int column);
+
         /// @brief Find a model index corresponding to the passed in data.
         ///
         /// @param [in] lookup The value to find.

source/frontend/models/resource_item_model.cpp

@@ -53,6 +53,9 @@ namespace rmv
         resource_table->SetColumnWidthEms(kResourceColumnCompareId, 8);
         resource_table->SetColumnWidthEms(kResourceColumnName, 20);
         resource_table->SetColumnWidthEms(kResourceColumnVirtualAddress, 11);
+        resource_table->SetColumnWidthEms(kResourceColumnDimension, 11);
+        resource_table->SetColumnWidthEms(kResourceColumnMipLevel, 6);
+        resource_table->SetColumnWidthEms(kResourceColumnFormat, 8);
         resource_table->SetColumnWidthEms(kResourceColumnSize, 8);
         resource_table->SetColumnWidthEms(kResourceColumnPreferredHeap, 11);
         resource_table->SetColumnWidthEms(kResourceColumnMappedInvisible, 13);
@@ -134,6 +137,18 @@ namespace rmv
                 return cache_[row].resource_name;
             case kResourceColumnVirtualAddress:
                 return rmv::string_util::LocalizedValueAddress(RmtResourceGetVirtualAddress(resource));
+            case kResourceColumnDimension:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString::asprintf("%dx%dx%d", resource->image.dimension_x, resource->image.dimension_y, resource->image.dimension_z)
+                        : QString("-");
+            case kResourceColumnMipLevel:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString::asprintf("%d", resource->image.mip_levels)
+                        : QString("-");
+            case kResourceColumnFormat:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString(RmtGetFormatNameFromFormat(resource->image.format.format))
+                        : QString("-");
             case kResourceColumnSize:
                 return rmv::string_util::LocalizedValueMemory(resource->size_in_bytes, false, false);
             case kResourceColumnMappedInvisible:
@@ -179,6 +194,18 @@ namespace rmv
                 return QVariant::fromValue<qulonglong>(resource->identifier);
             case kResourceColumnVirtualAddress:
                 return QVariant::fromValue<qulonglong>(RmtResourceGetVirtualAddress(resource));
+            case kResourceColumnDimension:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QList<QVariant>({resource->image.dimension_x, resource->image.dimension_y, resource->image.dimension_z})
+                        : QList<QVariant>({0, 0, 0});
+            case kResourceColumnMipLevel:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? resource->image.mip_levels
+                        : 0;
+            case kResourceColumnFormat:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString(RmtGetFormatNameFromFormat(resource->image.format.format))
+                        : QString("-");
             case kResourceColumnSize:
                 return QVariant::fromValue<qulonglong>(resource->size_in_bytes);
             case kResourceColumnMappedInvisible:
@@ -207,6 +234,18 @@ namespace rmv
             {
             case kResourceColumnName:
                 return cache_[row].resource_name;
+            case kResourceColumnDimension:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString::asprintf("%dx%dx%d", resource->image.dimension_x, resource->image.dimension_y, resource->image.dimension_z)
+                        : QString("-");
+            case kResourceColumnMipLevel:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString::asprintf("%d", resource->image.mip_levels)
+                        : QString("-");
+            case kResourceColumnFormat:
+                return resource->resource_type == kRmtResourceTypeImage
+                        ? QString(RmtGetFormatNameFromFormat(resource->image.format.format))
+                        : QString("-");
             case kResourceColumnSize:
                 return rmv::string_util::LocalizedValueBytes(resource->size_in_bytes);
             case kResourceColumnMappedInvisible:
@@ -243,6 +282,12 @@ namespace rmv
                 return "Name";
             case kResourceColumnVirtualAddress:
                 return "Virtual address";
+            case kResourceColumnDimension:
+                return "Dimension";
+            case kResourceColumnMipLevel:
+                return "Mip Level";
+            case kResourceColumnFormat:
+                return "Format";
             case kResourceColumnSize:
                 return "Size";
             case kResourceColumnPreferredHeap:

source/frontend/models/resource_item_model.h

@@ -26,13 +26,16 @@ namespace rmv
         kResourceColumnCompareId,
         kResourceColumnName,
         kResourceColumnVirtualAddress,
+        kResourceColumnUsage,
+        kResourceColumnDimension,
+        kResourceColumnMipLevel,
+        kResourceColumnFormat,
         kResourceColumnSize,
         kResourceColumnPreferredHeap,
         kResourceColumnMappedInvisible,
         kResourceColumnMappedLocal,
         kResourceColumnMappedHost,
         kResourceColumnMappedNone,
-        kResourceColumnUsage,
 
         // Hidden, these columns are used as proxies for sorting by other columns.
         kResourceColumnAllocationIdInternal,

source/frontend/settings/rmv_settings.cpp

@@ -206,6 +206,7 @@ namespace rmv
         default_settings_[kSettingLastFileOpenLocation]                     = {"LastFileOpenLocation", ""};
         default_settings_[kSettingGeneralCheckForUpdatesOnStartup]          = {"CheckForUpdatesOnStartup", "False"};
         default_settings_[kSettingGeneralTimeUnits]                         = {"TimeUnits", rmv::text::kSettingsUnitsSeconds};
+        default_settings_[kSettingGeneralByteUnits]                         = {"ByteUnits", rmv::text::kSettingsByteUnitsDefault};
         default_settings_[kSettingGeneralDriverOverridesAllowNotifications] = {"DriverOverridesAllowNotifications", "True"};
 
         default_settings_[kSettingThemesAndColorsPalette] = {"ColorPalette",
@@ -362,6 +363,11 @@ namespace rmv
         }
     }
 
+    QString RMVSettings::GetByteUnits() const
+    {
+        return active_settings_[kSettingGeneralByteUnits].value;
+    }
+
     int RMVSettings::GetWindowWidth() const
     {
         return GetIntValue(kSettingMainWindowWidth);
@@ -420,6 +426,19 @@ namespace rmv
         SaveSettings();
     }
 
+    void RMVSettings::SetByteUnits(const QString& units)
+    {
+        if (units == rmv::text::kSettingsByteUnitsBinary || units == rmv::text::kSettingsByteUnitsDecimal)
+        {
+            AddPotentialSetting(default_settings_[kSettingGeneralByteUnits].name, units);
+        }
+        else
+        {
+            AddPotentialSetting(default_settings_[kSettingGeneralByteUnits].name, rmv::text::kSettingsByteUnitsDefault);
+        }
+        SaveSettings();
+    }
+
     void RMVSettings::SetLastFileOpenLocation(const QString& last_file_open_location)
     {
         AddPotentialSetting("LastFileOpenLocation", last_file_open_location);

source/frontend/settings/rmv_settings.h

@@ -97,6 +97,8 @@ enum RMVSettingID
     kSettingThemesAndColorsCommitTypePlaced,
     kSettingThemesAndColorsCommitTypeVirtual,
 
+    kSettingGeneralByteUnits,
+
     kSettingCount,
 };
 
@@ -220,6 +222,11 @@ namespace rmv
         /// @return A TimeUnitType value.
         TimeUnitType GetUnits() const;
 
+        /// @brief Get byte units from the settings.
+        ///
+        /// @return The string value for Byte Unit.
+        QString GetByteUnits() const;
+
         /// @brief Get last file open location from the settings.
         ///
         /// @return Path to last opened file dir.
@@ -264,6 +271,11 @@ namespace rmv
         /// @param [in] units The new value of the timing units.
         void SetUnits(const TimeUnitType units);
 
+        /// @brief Set the byte units in the settings.
+        ///
+        /// @param [in] units The new value of the byte units.
+        void SetByteUnits(const QString& units);
+
         /// @brief Get the value of kSettingGeneralCheckForUpdatesOnStartup in the settings.
         ///
         /// @return The value of kSettingGeneralCheckForUpdatesOnStartup.

source/frontend/util/constants.h

@@ -137,6 +137,11 @@ namespace rmv
         static const QString kSettingsUnitsMinutes      = "Minutes";
         static const QString kSettingsUnitsHours        = "Hours";
 
+        // Byte units.
+        static const QString kSettingsByteUnitsDefault = "Default";
+        static const QString kSettingsByteUnitsBinary  = "Binary";
+        static const QString kSettingsByteUnitsDecimal = "Decimal";
+
         // Help file locations for trace and RMV.
         static const QString kTraceHelpFile       = "/help/rdp/index.html";
         static const QString kRmvHelpFile         = "/help/rmv/index.html";

source/frontend/util/string_util.cpp

@@ -12,6 +12,8 @@
 
 #include "qt_common/utils/qt_util.h"
 
+#include "settings/rmv_settings.h"
+
 QString rmv::string_util::ToUpperCase(const QString& string)
 {
     QString out;
@@ -69,8 +71,19 @@ QString rmv::string_util::LocalizedValuePrecise(double value)
     return str;
 }
 
-QString rmv::string_util::LocalizedValueMemory(const double value, const bool base_10, const bool use_round, const bool include_decimal)
+QString rmv::string_util::LocalizedValueMemory(const double value, const bool in_base_10, const bool use_round, const bool include_decimal)
 {
+    QString ByteUnits = RMVSettings::Get().GetByteUnits();
+    bool base_10 = in_base_10;
+    if (ByteUnits == rmv::text::kSettingsByteUnitsBinary)
+    {
+        base_10 = false;
+    }
+    else if (ByteUnits == rmv::text::kSettingsByteUnitsDecimal)
+    {
+        base_10 = true;
+    }
+
     double multiple;
     if (base_10)
     {