From e1cfb84cac4ed1925c0b5813973996db1759c96c Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@gmail.com>
Date: Fri, 8 Sep 2023 14:35:56 +0800
Subject: [PATCH] update few

---
 DistributionChart2D.cpp            |  8 ++-
 android/SOCDataBase/db/Adreno.csv  | 94 +++++++++++++++---------------
 android/SOCDataBase/db/Mali.csv    | 66 ++++++++++-----------
 android/SOCDataBase/db/PowerVR.csv | 69 ++++++++++++----------
 4 files changed, 123 insertions(+), 114 deletions(-)

diff --git a/DistributionChart2D.cpp b/DistributionChart2D.cpp
index 9eaf595..29b51c2 100644
--- a/DistributionChart2D.cpp
+++ b/DistributionChart2D.cpp
@@ -15,6 +15,10 @@ using namespace hgl;
 
 OSString csv_filename;
 
+uint MAP_RATE_SCALE=100;                    //地图缩小比例，UNREAL中单位为厘米，换算到米需要/100。
+                                            //原地图4K，现底层为1K，所以需要再/4。
+                                            //2K地图用的底层为2K，所以只/100
+
 using BitmapRGB8=bitmap::Bitmap<Vector3u8>;
 using BitmapRGBA8=bitmap::Bitmap<Vector4u8>;
 
@@ -235,8 +239,8 @@ bool ParsePosition(Vector2i *result,const UTF8String &str)
     if(!hgl::stoi(sp,result->y))
         return(false);
 
-    result->x/=400;     //Unreal单位为cm,把单位缩到米
-    result->y/=400;     //同时把4096的地图缩小到1024
+    result->x/=MAP_RATE_SCALE;     //Unreal单位为cm,把单位缩到米
+    result->y/=MAP_RATE_SCALE;     //同时把4096的地图缩小到1024
 
     if(result->x>=BackgroundBitmap->GetWidth()
      ||result->y>=BackgroundBitmap->GetHeight()
diff --git a/android/SOCDataBase/db/Adreno.csv b/android/SOCDataBase/db/Adreno.csv
index d3a4f49..48c7d12 100644
--- a/android/SOCDataBase/db/Adreno.csv
+++ b/android/SOCDataBase/db/Adreno.csv
@@ -1,47 +1,47 @@
-Code,CoreRate,Cache,MemoryBandwidth,fp16,vulkan,es
-304,400,96,3,38.4,0,3
-305Gen1,400,256,3.2,38.4,0,3
-305Gen2,400,128,4.2,38.4,0,3
-306,400,128,4.2,38.4,0,3
-308,500,128,5.3,48,0,3
-320Gen1,400,512,8.5,102.4,0,3
-320Gen2,400,512,9.6,153.6,0,3
-330,450,1024,12.8,230.4,0,3
-405,550,256,5.3,105.6,0,3.1
-418,600,512,14.9,307.2,1,3.1
-420,500,1536,25.6,256,1,3.1
-430,500,1536,25.6,512,1,3.1
-504,450,128,6.4,64,1,3.1
-505,450,128,6.4,86.4,1,3.1
-506,600,128,7.4,230.4,1,3.1
-508,650,128,10.6,332.8,1,3.1
-509,720,256,21.3,368.6,1,3.1
-510,600,256,14.9,307.2,1,3.1
-512,650,256,29.8,332.8,1,3.1
-530,510,1024,29.8,522.2,1,3.1
-540,710,1024,29.8,1090.5,1,3.1
-605,,128,,,1.1,3.2
-608,,,17,,1.1,3.2
-610,600,,,307.2,1.1,3.2
-612,745,256,14.9,572.1,1.1,3.2
-615,700,512,14.9,716.8,1.1,3.2
-616,750,512,14.9,768,1.1,3.2
-618,700,512,14.9,716.8,1.1,3.2
-619L,950,512,17,972.8,1.1,3.2
-619,825,512,17,844.8,1.1,3.2
-620,625,512,17,960,1.1,3.2
-630,710,1024,29.8,1454,1.1,3.2
-640,585,1024,34.1,1797.1,1.1,3.2
-642L,490,1024,17,1505.2,1.1,3.2
-642,490,1024,17,1505.2,1.1,3.2
-643L,812,,34.1,2494.4,1.1,3.2
-650,587,,34.1,2404.3,1.1,3.2
-660,792,,51.2,3244,1.1,3.2
-675,590,,34.1,3171.8,1.1,3.2
-680,600,,68.2,3686.4,1.1,3.2
-685,590,,68.2,3624.9,1.1,3.2
-690,680,,68.2,4177.9,1.1,3.2
-702,845,,14.9,2595.8,1.1,3.1
-725,580,1024,64,3563.5,1.1,3.2
-730,818,1024,64,5025.7,1.1,3.2
-740,680,,64,6953.2,1.1,3.2
+Code,CoreRate,Cache,MemoryBandwidth,fp16,vulkan,es,ASTC LDR,ASTC HDR
+304,400,96,3,38.4,0,3,,
+305Gen1,400,256,3.2,38.4,0,3,,
+305Gen2,400,128,4.2,38.4,0,3,,
+306,400,128,4.2,38.4,0,3,Yes,
+308,500,128,5.3,48,0,3,,
+320Gen1,400,512,8.5,102.4,0,3,,
+320Gen2,400,512,9.6,153.6,0,3,,
+330,450,1024,12.8,230.4,0,3,,
+405,550,256,5.3,105.6,0,3.1,Yes,
+418,600,512,14.9,307.2,1,3.1,Yes,
+420,500,1536,25.6,256,1,3.1,Yes,
+430,500,1536,25.6,512,1,3.1,Yes,
+504,450,128,6.4,64,1,3.1,Yes,
+505,450,128,6.4,86.4,1,3.1,Yes,
+506,600,128,7.4,230.4,1,3.1,Yes,
+508,650,128,10.6,332.8,1,3.1,Yes,
+509,720,256,21.3,368.6,1,3.1,Yes,
+510,600,256,14.9,307.2,1,3.1,Yes,
+512,650,256,29.8,332.8,1,3.1,Yes,
+530,510,1024,29.8,522.2,1,3.1,Yes,
+540,710,1024,29.8,1090.5,1,3.1,Yes,
+605,,128,,,1.1,3.2,Yes,
+608,,,17,,1.1,3.2,Yes,
+610,600,,,307.2,1.1,3.2,Yes,
+612,745,256,14.9,572.1,1.1,3.2,Yes,
+615,700,512,14.9,716.8,1.1,3.2,Yes,
+616,750,512,14.9,768,1.1,3.2,Yes,
+618,700,512,14.9,716.8,1.1,3.2,Yes,
+619L,950,512,17,972.8,1.1,3.2,Yes,
+619,825,512,17,844.8,1.1,3.2,Yes,
+620,625,512,17,960,1.1,3.2,Yes,
+630,710,1024,29.8,1454,1.1,3.2,Yes,
+640,585,1024,34.1,1797.1,1.1,3.2,Yes,
+642L,490,1024,17,1505.2,1.1,3.2,Yes,
+642,490,1024,17,1505.2,1.1,3.2,Yes,
+643L,812,,34.1,2494.4,1.1,3.2,Yes,
+650,587,,34.1,2404.3,1.1,3.2,Yes,
+660,792,,51.2,3244,1.1,3.2,Yes,
+675,590,,34.1,3171.8,1.1,3.2,Yes,
+680,600,,68.2,3686.4,1.1,3.2,Yes,
+685,590,,68.2,3624.9,1.1,3.2,Yes,
+690,680,,68.2,4177.9,1.1,3.2,Yes,
+702,845,,14.9,2595.8,1.1,3.1,Yes,
+725,580,1024,64,3563.5,1.1,3.2,Yes,
+730,818,1024,64,5025.7,1.1,3.2,Yes,
+740,680,,64,6953.2,1.1,3.2,Yes,
diff --git a/android/SOCDataBase/db/Mali.csv b/android/SOCDataBase/db/Mali.csv
index 745f485..c82b224 100644
--- a/android/SOCDataBase/db/Mali.csv
+++ b/android/SOCDataBase/db/Mali.csv
@@ -1,33 +1,33 @@
-Brand,Code,CoreMin,CoreMax,Cache,fp32,vulkan,es
-Mali,T604,1,4,32,17,0,3.1
-Mali,T658,1,8,32,,0,3.1
-Mali,T622,1,2,32,8.5,0,3.1
-Mali,T624,1,4,32,17,0,3.1
-Mali,T628,1,8,32,17,0,3.1
-Mali,T678,1,8,32,17,0,3.1
-Mali,T720,1,8,256,6.8,1,3.1
-Mali,T760,1,16,256,17,1,3.1
-Mali,T820,1,4,32,10.2,1,3.1
-Mali,T830,1,4,32,20.4,1,3.1
-Mali,T860,1,16,32,11.9,1,3.1
-Mali,T880,1,16,256,22.1,1,3.1
-Mali,G31,1,6,32,10.4,1.3,3.2
-Mali,G51,1,6,32,20.8,1.3,3.2
-Mali,G71,1,32,128,18.56,1.3,3.2
-Mali,G52,1,4,32,27.2,1.3,3.2
-Mali,G72,1,32,128,20.55,1.3,3.2
-Mali,G76,4,20,512,43.2,1.3,3.2
-Mali,G57,1,6,64,121.6,1.3,3.2
-Mali,G77,7,16,512,88.92,1.3,3.2
-Mali,G68,4,6,512,121,1.3,3.2
-Mali,G78,7,24,512,97.15,1.3,3.2
-Mali,G310,1,4,256,,1.3,3.2
-Mali,G510,2,6,256,,1.3,3.2
-Mali,G610,1,6,512,,1.3,3.2
-Mali,G710,7,16,512,73,1.3,3.2
-Mali,G615,1,6,512,,1.3,3.2
-Mali,G715,7,9,512,,1.3,3.2
-Mali,Immortalis-G715,10,16,512,329.6,1.3,3.2
-Mali,G620,1,5,256,,1.3,3.2
-Mali,G720,6,9,512,,1.3,3.2
-Mali,Immortalis-G720,10,32,512,,1.3,3.2
+Brand,Code,CoreMin,CoreMax,Cache,fp32,vulkan,es,ASTC LDR,ASTC HDR
+Mali,T604,1,4,32,17,0,3.1,,
+Mali,T658,1,8,32,,0,3.1,,
+Mali,T622,1,2,32,8.5,0,3.1,,
+Mali,T624,1,4,32,17,0,3.1,,
+Mali,T628,1,8,32,17,0,3.1,,
+Mali,T678,1,8,32,17,0,3.1,,
+Mali,T720,1,8,256,6.8,1,3.1,,
+Mali,T760,1,16,256,17,1,3.1,,
+Mali,T820,1,4,32,10.2,1,3.1,,
+Mali,T830,1,4,32,20.4,1,3.1,,
+Mali,T860,1,16,32,11.9,1,3.1,,
+Mali,T880,1,16,256,22.1,1,3.1,,
+Mali,G31,1,6,32,10.4,1.3,3.2,Yes,
+Mali,G51,1,6,32,20.8,1.3,3.2,Yes,
+Mali,G71,1,32,128,18.56,1.3,3.2,,
+Mali,G52,1,4,32,27.2,1.3,3.2,,
+Mali,G72,1,32,128,20.55,1.3,3.2,,
+Mali,G76,4,20,512,43.2,1.3,3.2,,
+Mali,G57,1,6,64,121.6,1.3,3.2,,
+Mali,G77,7,16,512,88.92,1.3,3.2,,
+Mali,G68,4,6,512,121,1.3,3.2,,
+Mali,G78,7,24,512,97.15,1.3,3.2,,
+Mali,G310,1,4,256,,1.3,3.2,,
+Mali,G510,2,6,256,,1.3,3.2,,
+Mali,G610,1,6,512,,1.3,3.2,,
+Mali,G710,7,16,512,73,1.3,3.2,,
+Mali,G615,1,6,512,,1.3,3.2,,
+Mali,G715,7,9,512,,1.3,3.2,,
+Mali,Immortalis-G715,10,16,512,329.6,1.3,3.2,,
+Mali,G620,1,5,256,,1.3,3.2,,
+Mali,G720,6,9,512,,1.3,3.2,,
+Mali,Immortalis-G720,10,32,512,,1.3,3.2,,
diff --git a/android/SOCDataBase/db/PowerVR.csv b/android/SOCDataBase/db/PowerVR.csv
index f114d35..9723be4 100644
--- a/android/SOCDataBase/db/PowerVR.csv
+++ b/android/SOCDataBase/db/PowerVR.csv
@@ -1,32 +1,37 @@
-Code,fp32,vulkan,es
-GE8100,16,1.3,3.2
-GE8200,16,1.1,3.2
-GE8300,32,1.1,3.2
-GE8310,32,1.1,3.2
-GE8320,64,1.1,3.2
-GE8325,64,1.1,3.2
-GE8340,128,1.1,3.2
-GE8430,128,1.1,3.2
-,,,
-GE9000,16,1.1,3.2
-GE9100,16,1.1,3.2
-GE9115,32,1.1,3.2
-GE9210,32,1.1,3.2
-GE9215,32,1.1,3.2
-GE9420,64,1.1,3.2
-GE9608,32,1.1,3.2
-GE9610,32,1.1,3.2
-GE9710,32,1.1,3.2
-GE9920,64,1.1,3.2
-,,,
-GM9125,64,1.1,3.2
-GM9220,64,1.1,3.2
-GM9226,64,1.1,3.2
-GM9240,128,1.1,3.2
-GM9446,128,1.1,3.2
-GM9740,128,1.1,3.2
-,,,
-GT8525,192,1.1,3.2
-,,,
-GT8540,384,1.1,3.2
-GT9524,240,1.1,3.2
+Code,fp32,vulkan,es,ASTC LDR,ASTC HDR
+GE8100,16,1.3,3.2,Yes,
+GE8200,16,1.1,3.2,,
+GE8300,32,1.1,3.2,Yes,
+GE8310,32,1.1,3.2,,
+GE8320,64,1.1,3.2,Yes,
+GE8322,,,,Yes,
+GE8325,64,1.1,3.2,,
+GE8340,128,1.1,3.2,,
+GE8430,128,1.1,3.2,,
+,,,,,
+GE9000,16,1.1,3.2,,
+GE9100,16,1.1,3.2,,
+GE9115,32,1.1,3.2,,
+GE9210,32,1.1,3.2,,
+GE9215,32,1.1,3.2,,
+GE9420,64,1.1,3.2,,
+GE9608,32,1.1,3.2,,
+GE9610,32,1.1,3.2,,
+GE9710,32,1.1,3.2,,
+GE9920,64,1.1,3.2,,
+,,,,,
+GM9125,64,1.1,3.2,,
+GM9220,64,1.1,3.2,,
+GM9226,64,1.1,3.2,,
+GM9240,128,1.1,3.2,,
+GM9446,128,1.1,3.2,Yes,
+GM9740,128,1.1,3.2,,
+,,,,,
+GT7400,,,,Yes,
+GT8525,192,1.1,3.2,,
+,,,,,
+GT8540,384,1.1,3.2,,
+GT9524,240,1.1,3.2,,
+,,,,,
+GX6250,,,,Yes,
+Marlowe,,,,Yes,