From 11f64ee27b1f8c5bcff318a4a37b64d54b6968ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 21 Jul 2015 20:48:10 +0200 Subject: [PATCH] System info: Make it obvious which GPU vendor we detected. Remove the math precision reporting, which seems inaccurate anyway. --- UI/DevScreens.cpp | 18 ++---------------- native | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 54ccfccfbf..16f7e8b8fb 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -337,7 +337,7 @@ void SystemInfoScreen::CreateViews() { Thin3DContext *thin3d = screenManager()->getThin3DContext(); deviceSpecs->Add(new InfoItem("3D API", thin3d->GetInfoString(T3DInfo::APINAME))); - deviceSpecs->Add(new InfoItem("Vendor", thin3d->GetInfoString(T3DInfo::VENDOR))); + deviceSpecs->Add(new InfoItem("Vendor", std::string(thin3d->GetInfoString(T3DInfo::VENDORSTRING)) + " (" + thin3d->GetInfoString(T3DInfo::VENDOR) + ")")); deviceSpecs->Add(new InfoItem("Model", thin3d->GetInfoString(T3DInfo::RENDERER))); #ifdef _WIN32 deviceSpecs->Add(new InfoItem("Driver Version", System_GetProperty(SYSPROP_GPUDRIVER_VERSION))); @@ -381,20 +381,6 @@ void SystemInfoScreen::CreateViews() { deviceSpecs->Add(new InfoItem("Display resolution", temp)); #endif - if (gl_extensions.precision[0] != 0) { - const char *stypes[2] = { "Vertex", "Fragment" }; - const char *ptypes[6] = { "LowF", "MediumF", "HighF", "LowI", "MediumI", "HighI" }; - - for (int st = 0; st < 2; st++) { - char bufValue[256], bufTitle[256]; - for (int p = 0; p < 6; p++) { - snprintf(bufTitle, sizeof(bufTitle), "Precision %s %s:", stypes[st], ptypes[p]); - snprintf(bufValue, sizeof(bufValue), "(%i, %i): %i", gl_extensions.range[st][p][0], gl_extensions.range[st][p][1], gl_extensions.precision[st][p]); - deviceSpecs->Add(new InfoItem(bufTitle, bufValue, new LayoutParams(FILL_PARENT, 30))); - } - } - } - ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); LinearLayout *cpuExtensions = new LinearLayout(ORIENT_VERTICAL); cpuExtensions->SetSpacing(0); @@ -408,7 +394,7 @@ void SystemInfoScreen::CreateViews() { for (size_t i = 2; i < exts.size(); i++) { cpuExtensions->Add(new TextView(exts[i]))->SetFocusable(true); } - + ViewGroup *oglExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); LinearLayout *oglExtensions = new LinearLayout(ORIENT_VERTICAL); oglExtensions->SetSpacing(0); diff --git a/native b/native index 166d07df0c..477568b348 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 166d07df0c37c038a02bda687ba77a5bbfd1d01c +Subproject commit 477568b3485e9921ede59c26b266c762b1fbd066