Move Buffer to the new "gl" subdirectory
... as the existing Buffer code in these files are GL specific.
Upcoming changes will rename Buffer to BufferGl and add a
generic Buffer which wraps the various APIs.
Bug: b/233939967
Test: android build
Test: cmake build
Test: cvd start --gpu_mode=gfxstream
Change-Id: I59a25785f21ab981d70bb3bc0dc050f458b7bddb
diff --git a/stream-servers/Android.bp b/stream-servers/Android.bp
index 85d51fb..1b6a8e4 100644
--- a/stream-servers/Android.bp
+++ b/stream-servers/Android.bp
@@ -53,7 +53,6 @@
"liblog", // gfxstream_base uses this via perfetto-libperfettobase
],
srcs: [
- "Buffer.cpp",
"ChannelStream.cpp",
"Debug.cpp",
"DisplaySurface.cpp",
diff --git a/stream-servers/CMakeLists.txt b/stream-servers/CMakeLists.txt
index 2605e64..05ab846 100644
--- a/stream-servers/CMakeLists.txt
+++ b/stream-servers/CMakeLists.txt
@@ -13,7 +13,6 @@
# Stream server core
set(stream-server-core-sources
- Buffer.cpp
GfxStreamAgents.cpp
VirtioGpuTimelines.cpp
ChannelStream.cpp
diff --git a/stream-servers/FrameBuffer.h b/stream-servers/FrameBuffer.h
index 2fe9001..da3575d 100644
--- a/stream-servers/FrameBuffer.h
+++ b/stream-servers/FrameBuffer.h
@@ -29,7 +29,6 @@
#include <GLES2/gl2ext.h>
#include <stdint.h>
-#include "Buffer.h"
#include "Compositor.h"
#include "Display.h"
#include "DisplaySurface.h"
@@ -46,6 +45,7 @@
#include "aemu/base/files/Stream.h"
#include "aemu/base/threads/Thread.h"
#include "aemu/base/threads/WorkerThread.h"
+#include "gl/BufferGl.h"
#include "gl/ColorBufferGl.h"
#include "gl/CompositorGl.h"
#include "gl/DisplaySurfaceGl.h"
diff --git a/stream-servers/gl/Android.bp b/stream-servers/gl/Android.bp
index fcaaec7..bc76f78 100644
--- a/stream-servers/gl/Android.bp
+++ b/stream-servers/gl/Android.bp
@@ -12,6 +12,7 @@
name: "gfxstream_gl_server",
defaults: [ "gfxstream_defaults" ],
srcs: [
+ "BufferGl.cpp",
"ColorBufferGl.cpp",
"CompositorGl.cpp",
"DisplayGl.cpp",
diff --git a/stream-servers/Buffer.cpp b/stream-servers/gl/BufferGl.cpp
similarity index 98%
rename from stream-servers/Buffer.cpp
rename to stream-servers/gl/BufferGl.cpp
index a435d4a..4962a35 100644
--- a/stream-servers/Buffer.cpp
+++ b/stream-servers/gl/BufferGl.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "Buffer.h"
+#include "BufferGl.h"
// static
Buffer* Buffer::create(size_t size, HandleType handle, ContextHelper* helper) {
diff --git a/stream-servers/Buffer.h b/stream-servers/gl/BufferGl.h
similarity index 100%
rename from stream-servers/Buffer.h
rename to stream-servers/gl/BufferGl.h
diff --git a/stream-servers/gl/CMakeLists.txt b/stream-servers/gl/CMakeLists.txt
index f1082d2..76eb44c 100644
--- a/stream-servers/gl/CMakeLists.txt
+++ b/stream-servers/gl/CMakeLists.txt
@@ -10,6 +10,7 @@
add_subdirectory(glsnapshot)
add_library(gfxstream-gl-server
+ BufferGl.cpp
ColorBufferGl.cpp
CompositorGl.cpp
DisplayGl.cpp
