yuzu/debugger/graphics_surface: Fill in missing surface format listings

Fills in the missing surface types that were marked as unknown. The order corresponds with the TextureFormat enum within video_core/texture.h. We also don't need to all of these strings as translatable (only the first string, as it's an English word).
author: Lioncash 2019-04-05 19:09:53 -0400
committer: Lioncash 2019-04-05 19:09:56 -0400
commit: 9d296f8a358dd6e033fc779d452a7440b4c48514 (patch)
tree: e6de8c591a9740028c841bf54472059dd2c8444a /src
parent: Merge pull request #2282 from bunnei/gpu-asynch-v2 (diff)
download: yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.tar.gz
yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.tar.xz
yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.zip
1 files changed, 84 insertions, 43 deletions
diff --git a/src/yuzu/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp
index 11023ed63..946a17dd8 100644
--- a/src/yuzu/debugger/graphics/graphics_surface.cpp
+++ b/src/yuzu/debugger/graphics/graphics_surface.cpp
@@ -95,50 +95,91 @@ GraphicsSurfaceWidget::GraphicsSurfaceWidget(std::shared_ptr<Tegra::DebugContext
    surface_picker_y_control = new QSpinBox;
    surface_picker_y_control->setRange(0, max_dimension - 1);
-    surface_format_control = new QComboBox;
+    // clang-format off
    // Color formats sorted by Maxwell texture format index
-    surface_format_control->addItem(tr("None"));
+    const QStringList surface_formats{
-    surface_format_control->addItem(tr("Unknown"));
+        tr("None"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R32_G32_B32_A32"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R32_G32_B32"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R16_G16_B16_A16"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R32_G32"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R32_B24G8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("ETC2_RGB"),
-    surface_format_control->addItem(tr("A8R8G8B8"));
+        QStringLiteral("X8B8G8R8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("A8R8G8B8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("A2B10G10R10"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("ETC2_RGB_PTA"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("ETC2_RGBA"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R16_G16"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("G8R24"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("G24R8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R32"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("BC6H_SF16"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("BC6H_UF16"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("A4B4G4R4"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("A5B5G5R1"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("A1B5G5R5"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("B5G6R5"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("B6G5R5"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("BC7U"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("G8R8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("EAC"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("EACX2"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R16"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("Y8_VIDEO"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R8"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("G4R4"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("R1"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("E5B9G9R9_SHAREDEXP"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("BF10GF11RF11"),
-    surface_format_control->addItem(tr("Unknown"));
+        QStringLiteral("G8B8G8R8"),
-    surface_format_control->addItem(tr("DXT1"));
+        QStringLiteral("B8G8R8G8"),
-    surface_format_control->addItem(tr("DXT23"));
+        QStringLiteral("DXT1"),
-    surface_format_control->addItem(tr("DXT45"));
+        QStringLiteral("DXT23"),
-    surface_format_control->addItem(tr("DXN1"));
+        QStringLiteral("DXT45"),
-    surface_format_control->addItem(tr("DXN2"));
+        QStringLiteral("DXN1"),
+        QStringLiteral("DXN2"),
+        QStringLiteral("Z24S8"),
+        QStringLiteral("X8Z24"),
+        QStringLiteral("S8Z24"),
+        QStringLiteral("X4V4Z24__COV4R4V"),
+        QStringLiteral("X4V4Z24__COV8R8V"),
+        QStringLiteral("V8Z24__COV4R12V"),
+        QStringLiteral("ZF32"),
+        QStringLiteral("ZF32_X24S8"),
+        QStringLiteral("X8Z24_X20V4S8__COV4R4V"),
+        QStringLiteral("X8Z24_X20V4S8__COV8R8V"),
+        QStringLiteral("ZF32_X20V4X8__COV4R4V"),
+        QStringLiteral("ZF32_X20V4X8__COV8R8V"),
+        QStringLiteral("ZF32_X20V4S8__COV4R4V"),
+        QStringLiteral("ZF32_X20V4S8__COV8R8V"),
+        QStringLiteral("X8Z24_X16V8S8__COV4R12V"),
+        QStringLiteral("ZF32_X16V8X8__COV4R12V"),
+        QStringLiteral("ZF32_X16V8S8__COV4R12V"),
+        QStringLiteral("Z16"),
+        QStringLiteral("V8Z24__COV8R24V"),
+        QStringLiteral("X8Z24_X16V8S8__COV8R24V"),
+        QStringLiteral("ZF32_X16V8X8__COV8R24V"),
+        QStringLiteral("ZF32_X16V8S8__COV8R24V"),
+        QStringLiteral("ASTC_2D_4X4"),
+        QStringLiteral("ASTC_2D_5X5"),
+        QStringLiteral("ASTC_2D_6X6"),
+        QStringLiteral("ASTC_2D_8X8"),
+        QStringLiteral("ASTC_2D_10X10"),
+        QStringLiteral("ASTC_2D_12X12"),
+        QStringLiteral("ASTC_2D_5X4"),
+        QStringLiteral("ASTC_2D_6X5"),
+        QStringLiteral("ASTC_2D_8X6"),
+        QStringLiteral("ASTC_2D_10X8"),
+        QStringLiteral("ASTC_2D_12X10"),
+        QStringLiteral("ASTC_2D_8X5"),
+        QStringLiteral("ASTC_2D_10X5"),
+        QStringLiteral("ASTC_2D_10X6"),
+    };
+    // clang-format on
+    surface_format_control = new QComboBox;
+    surface_format_control->addItems(surface_formats);
    surface_info_label = new QLabel();
    surface_info_label->setWordWrap(true);
author	Lioncash	2019-04-05 19:09:53 -0400
committer	Lioncash	2019-04-05 19:09:56 -0400
commit	9d296f8a358dd6e033fc779d452a7440b4c48514 (patch)
tree	e6de8c591a9740028c841bf54472059dd2c8444a /src
parent	Merge pull request #2282 from bunnei/gpu-asynch-v2 (diff)
download	yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.tar.gz yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.tar.xz yuzu-9d296f8a358dd6e033fc779d452a7440b4c48514.zip

diff --git a/src/yuzu/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp index 11023ed63..946a17dd8 100644 --- a/src/yuzu/debugger/graphics/graphics_surface.cpp +++ b/src/yuzu/debugger/graphics/graphics_surface.cpp
@@ -95,50 +95,91 @@ GraphicsSurfaceWidget::GraphicsSurfaceWidget(std::shared_ptr<Tegra::DebugContext
95	surface_picker_y_control = new QSpinBox;	95	surface_picker_y_control = new QSpinBox;
96	surface_picker_y_control->setRange(0, max_dimension - 1);	96	surface_picker_y_control->setRange(0, max_dimension - 1);
97		97
98	surface_format_control = new QComboBox;	98	// clang-format off
99
100	// Color formats sorted by Maxwell texture format index	99	// Color formats sorted by Maxwell texture format index
101	surface_format_control->addItem(tr("None"));	100	const QStringList surface_formats{
102	surface_format_control->addItem(tr("Unknown"));	101	tr("None"),
103	surface_format_control->addItem(tr("Unknown"));	102	QStringLiteral("R32_G32_B32_A32"),
104	surface_format_control->addItem(tr("Unknown"));	103	QStringLiteral("R32_G32_B32"),
105	surface_format_control->addItem(tr("Unknown"));	104	QStringLiteral("R16_G16_B16_A16"),
106	surface_format_control->addItem(tr("Unknown"));	105	QStringLiteral("R32_G32"),
107	surface_format_control->addItem(tr("Unknown"));	106	QStringLiteral("R32_B24G8"),
108	surface_format_control->addItem(tr("Unknown"));	107	QStringLiteral("ETC2_RGB"),
109	surface_format_control->addItem(tr("A8R8G8B8"));	108	QStringLiteral("X8B8G8R8"),
110	surface_format_control->addItem(tr("Unknown"));	109	QStringLiteral("A8R8G8B8"),
111	surface_format_control->addItem(tr("Unknown"));	110	QStringLiteral("A2B10G10R10"),
112	surface_format_control->addItem(tr("Unknown"));	111	QStringLiteral("ETC2_RGB_PTA"),
113	surface_format_control->addItem(tr("Unknown"));	112	QStringLiteral("ETC2_RGBA"),
114	surface_format_control->addItem(tr("Unknown"));	113	QStringLiteral("R16_G16"),
115	surface_format_control->addItem(tr("Unknown"));	114	QStringLiteral("G8R24"),
116	surface_format_control->addItem(tr("Unknown"));	115	QStringLiteral("G24R8"),
117	surface_format_control->addItem(tr("Unknown"));	116	QStringLiteral("R32"),
118	surface_format_control->addItem(tr("Unknown"));	117	QStringLiteral("BC6H_SF16"),
119	surface_format_control->addItem(tr("Unknown"));	118	QStringLiteral("BC6H_UF16"),
120	surface_format_control->addItem(tr("Unknown"));	119	QStringLiteral("A4B4G4R4"),
121	surface_format_control->addItem(tr("Unknown"));	120	QStringLiteral("A5B5G5R1"),
122	surface_format_control->addItem(tr("Unknown"));	121	QStringLiteral("A1B5G5R5"),
123	surface_format_control->addItem(tr("Unknown"));	122	QStringLiteral("B5G6R5"),
124	surface_format_control->addItem(tr("Unknown"));	123	QStringLiteral("B6G5R5"),
125	surface_format_control->addItem(tr("Unknown"));	124	QStringLiteral("BC7U"),
126	surface_format_control->addItem(tr("Unknown"));	125	QStringLiteral("G8R8"),
127	surface_format_control->addItem(tr("Unknown"));	126	QStringLiteral("EAC"),
128	surface_format_control->addItem(tr("Unknown"));	127	QStringLiteral("EACX2"),
129	surface_format_control->addItem(tr("Unknown"));	128	QStringLiteral("R16"),
130	surface_format_control->addItem(tr("Unknown"));	129	QStringLiteral("Y8_VIDEO"),
131	surface_format_control->addItem(tr("Unknown"));	130	QStringLiteral("R8"),
132	surface_format_control->addItem(tr("Unknown"));	131	QStringLiteral("G4R4"),
133	surface_format_control->addItem(tr("Unknown"));	132	QStringLiteral("R1"),
134	surface_format_control->addItem(tr("Unknown"));	133	QStringLiteral("E5B9G9R9_SHAREDEXP"),
135	surface_format_control->addItem(tr("Unknown"));	134	QStringLiteral("BF10GF11RF11"),
136	surface_format_control->addItem(tr("Unknown"));	135	QStringLiteral("G8B8G8R8"),
137	surface_format_control->addItem(tr("DXT1"));	136	QStringLiteral("B8G8R8G8"),
138	surface_format_control->addItem(tr("DXT23"));	137	QStringLiteral("DXT1"),
139	surface_format_control->addItem(tr("DXT45"));	138	QStringLiteral("DXT23"),
140	surface_format_control->addItem(tr("DXN1"));	139	QStringLiteral("DXT45"),
141	surface_format_control->addItem(tr("DXN2"));	140	QStringLiteral("DXN1"),
		141	QStringLiteral("DXN2"),
		142	QStringLiteral("Z24S8"),
		143	QStringLiteral("X8Z24"),
		144	QStringLiteral("S8Z24"),
		145	QStringLiteral("X4V4Z24__COV4R4V"),
		146	QStringLiteral("X4V4Z24__COV8R8V"),
		147	QStringLiteral("V8Z24__COV4R12V"),
		148	QStringLiteral("ZF32"),
		149	QStringLiteral("ZF32_X24S8"),
		150	QStringLiteral("X8Z24_X20V4S8__COV4R4V"),
		151	QStringLiteral("X8Z24_X20V4S8__COV8R8V"),
		152	QStringLiteral("ZF32_X20V4X8__COV4R4V"),
		153	QStringLiteral("ZF32_X20V4X8__COV8R8V"),
		154	QStringLiteral("ZF32_X20V4S8__COV4R4V"),
		155	QStringLiteral("ZF32_X20V4S8__COV8R8V"),
		156	QStringLiteral("X8Z24_X16V8S8__COV4R12V"),
		157	QStringLiteral("ZF32_X16V8X8__COV4R12V"),
		158	QStringLiteral("ZF32_X16V8S8__COV4R12V"),
		159	QStringLiteral("Z16"),
		160	QStringLiteral("V8Z24__COV8R24V"),
		161	QStringLiteral("X8Z24_X16V8S8__COV8R24V"),
		162	QStringLiteral("ZF32_X16V8X8__COV8R24V"),
		163	QStringLiteral("ZF32_X16V8S8__COV8R24V"),
		164	QStringLiteral("ASTC_2D_4X4"),
		165	QStringLiteral("ASTC_2D_5X5"),
		166	QStringLiteral("ASTC_2D_6X6"),
		167	QStringLiteral("ASTC_2D_8X8"),
		168	QStringLiteral("ASTC_2D_10X10"),
		169	QStringLiteral("ASTC_2D_12X12"),
		170	QStringLiteral("ASTC_2D_5X4"),
		171	QStringLiteral("ASTC_2D_6X5"),
		172	QStringLiteral("ASTC_2D_8X6"),
		173	QStringLiteral("ASTC_2D_10X8"),
		174	QStringLiteral("ASTC_2D_12X10"),
		175	QStringLiteral("ASTC_2D_8X5"),
		176	QStringLiteral("ASTC_2D_10X5"),
		177	QStringLiteral("ASTC_2D_10X6"),
		178	};
		179	// clang-format on
		180
		181	surface_format_control = new QComboBox;
		182	surface_format_control->addItems(surface_formats);
142		183
143	surface_info_label = new QLabel();	184	surface_info_label = new QLabel();
144	surface_info_label->setWordWrap(true);	185	surface_info_label->setWordWrap(true);