commit 1ee62ea9f9cdce855143ec25f3cae9a2ccfb2dea
author Jason Macnak <natsu@google.com> Tue Aug 30 16:54:57 2022 -0700
committer Jason Macnak <natsu@google.com> Tue Sep 20 14:20:12 2022 -0700
tree 5c1cd42d7a444df586503e97020503a134a90541
parent 3dadb78129d0ae186be74d4ae72e632b563156cc

Move GLESVersionDetector to the new "gl" subdirectory

... as this is GL specific and would not be used
when guest is running with ANGLE.

Bug: b/233939967
Test: android build
Test: cmake build
Test: cvd start --gpu_mode=gfxstream
Change-Id: I35d2ea39ca6b2830c2912363aa23dd75d2d6dc2a

stream-servers/Android.bp

diff --git a/stream-servers/Android.bp b/stream-servers/Android.bp
index dafadee..534e28d 100644
--- a/stream-servers/Android.bp
+++ b/stream-servers/Android.bp
@@ -60,7 +60,6 @@
         "ColorBuffer.cpp",
         "Debug.cpp",
         "FenceSync.cpp",
-        "GLESVersionDetector.cpp",
         "Hwc2.cpp",
         "PostWorker.cpp",
         "ReadbackWorker.cpp",

stream-servers/CMakeLists.txt

diff --git a/stream-servers/CMakeLists.txt b/stream-servers/CMakeLists.txt
index 92d0cc7..62975d8 100644
--- a/stream-servers/CMakeLists.txt
+++ b/stream-servers/CMakeLists.txt
@@ -22,7 +22,6 @@
     ColorBuffer.cpp
     Debug.cpp
     FenceSync.cpp
-    GLESVersionDetector.cpp
     Hwc2.cpp
     PostWorker.cpp
     ReadbackWorker.cpp

stream-servers/FrameBuffer.h

diff --git a/stream-servers/FrameBuffer.h b/stream-servers/FrameBuffer.h
index ac87328..7eb6b60 100644
--- a/stream-servers/FrameBuffer.h
+++ b/stream-servers/FrameBuffer.h
@@ -32,7 +32,6 @@
 #include "ColorBuffer.h"
 #include "Compositor.h"
 #include "DisplayVk.h"
-#include "GLESVersionDetector.h"
 #include "Hwc2.h"
 #include "PostCommands.h"
 #include "PostWorker.h"
@@ -50,6 +49,7 @@
 #include "base/WorkerThread.h"
 #include "gl/CompositorGl.h"
 #include "gl/EmulatedEglConfig.h"
+#include "gl/GLESVersionDetector.h"
 #include "gl/TextureDraw.h"
 #include "host-common/RenderDoc.h"
 #include "render_api.h"

stream-servers/gl/Android.bp

diff --git a/stream-servers/gl/Android.bp b/stream-servers/gl/Android.bp
index bd63110..8f410bf 100644
--- a/stream-servers/gl/Android.bp
+++ b/stream-servers/gl/Android.bp
@@ -14,6 +14,7 @@
     srcs: [
         "CompositorGl.cpp",
         "EmulatedEglConfig.cpp",
+        "GLESVersionDetector.cpp",
         "TextureDraw.cpp",
         "TextureResize.cpp",
     ],

stream-servers/gl/CMakeLists.txt

diff --git a/stream-servers/gl/CMakeLists.txt b/stream-servers/gl/CMakeLists.txt
index 09bcd21..fd06590 100644
--- a/stream-servers/gl/CMakeLists.txt
+++ b/stream-servers/gl/CMakeLists.txt
@@ -11,6 +11,7 @@
 add_library(gfxstream-gl-server
             CompositorGl.cpp
             EmulatedEglConfig.cpp
+            GLESVersionDetector.cpp
             TextureDraw.cpp
             TextureResize.cpp)
 

stream-servers/gl/GLESVersionDetector.cpp

diff --git a/stream-servers/GLESVersionDetector.cpp b/stream-servers/gl/GLESVersionDetector.cpp
similarity index 100%
rename from stream-servers/GLESVersionDetector.cpp
rename to stream-servers/gl/GLESVersionDetector.cpp

stream-servers/gl/GLESVersionDetector.h

diff --git a/stream-servers/GLESVersionDetector.h b/stream-servers/gl/GLESVersionDetector.h
similarity index 100%
rename from stream-servers/GLESVersionDetector.h
rename to stream-servers/gl/GLESVersionDetector.h