commit 174a2a0e76ce64402885ae1aafc2ccef19034c56
author Yiwei Zhang <zzyiwei@google.com> Mon May 06 19:08:31 2019 -0700
committer Yiwei Zhang <zzyiwei@google.com> Mon May 06 19:11:23 2019 -0700
tree be41ffb1a5f6627eadc647177b2adbe96ec05eba
parent 794d295a61f5b0649023e1218aa18cce5f32f4d3

GpuStats: plumb all 3d api versions

Bug: 131866357
Test: adb shell dumpsys gpu
Change-Id: I2ef57cb61f51f380745c2ea363b36f093befc313

libs/graphicsenv/GpuStatsInfo.cpp

diff --git a/libs/graphicsenv/GpuStatsInfo.cpp b/libs/graphicsenv/GpuStatsInfo.cpp
index cbf6e50..f89b4c1 100644
--- a/libs/graphicsenv/GpuStatsInfo.cpp
+++ b/libs/graphicsenv/GpuStatsInfo.cpp
@@ -35,6 +35,8 @@
     if ((status = parcel->writeInt32(vkLoadingCount)) != OK) return status;
     if ((status = parcel->writeInt32(vkLoadingFailureCount)) != OK) return status;
     if ((status = parcel->writeInt32(vulkanVersion)) != OK) return status;
+    if ((status = parcel->writeInt32(cpuVulkanVersion)) != OK) return status;
+    if ((status = parcel->writeInt32(glesVersion)) != OK) return status;
     return OK;
 }
 
@@ -49,6 +51,8 @@
     if ((status = parcel->readInt32(&vkLoadingCount)) != OK) return status;
     if ((status = parcel->readInt32(&vkLoadingFailureCount)) != OK) return status;
     if ((status = parcel->readInt32(&vulkanVersion)) != OK) return status;
+    if ((status = parcel->readInt32(&cpuVulkanVersion)) != OK) return status;
+    if ((status = parcel->readInt32(&glesVersion)) != OK) return status;
     return OK;
 }
 
@@ -63,6 +67,8 @@
     StringAppendF(&result, "vkLoadingCount = %d\n", vkLoadingCount);
     StringAppendF(&result, "vkLoadingFailureCount = %d\n", vkLoadingFailureCount);
     StringAppendF(&result, "vulkanVersion = %d\n", vulkanVersion);
+    StringAppendF(&result, "cpuVulkanVersion = %d\n", cpuVulkanVersion);
+    StringAppendF(&result, "glesVersion = %d\n", glesVersion);
     return result;
 }
 

libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h

diff --git a/libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h b/libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h
index e96c932..98ab02b 100644
--- a/libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h
+++ b/libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h
@@ -45,6 +45,8 @@
     int32_t vkLoadingCount = 0;
     int32_t vkLoadingFailureCount = 0;
     int32_t vulkanVersion = 0;
+    int32_t cpuVulkanVersion = 0;
+    int32_t glesVersion = 0;
 };
 
 /*