diff options
| author | Roman Kiryanov <rkir@google.com> | 2018-09-26 11:23:59 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2018-09-26 13:46:29 -0700 |
| commit | 32a9b876ecdba722e9551ffe9ac449af70540dbe (patch) | |
| tree | 492d5f224ba12e24ab3b49687e55792368ca7ba8 | |
| parent | e38d15c1ef884307b53ce83264c08cf329840efc (diff) | |
| download | device_generic_goldfish-opengl-32a9b876ecdba722e9551ffe9ac449af70540dbe.tar.gz device_generic_goldfish-opengl-32a9b876ecdba722e9551ffe9ac449af70540dbe.tar.bz2 device_generic_goldfish-opengl-32a9b876ecdba722e9551ffe9ac449af70540dbe.zip | |
Move IO related to shared/OpenglCodecCommon to make them visible to GLSharedGroup.h
We want to add some DMA context into GLSharedGroup.h to use them in
glMapBufferRange.
Bug: 116046430
Test: make -j
Change-Id: I5dee9fee00b77fbeb3df45b9a7e7cd5e7ae8aaf6
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | shared/OpenglCodecCommon/Android.mk | 13 | ||||
| -rw-r--r-- | shared/OpenglCodecCommon/goldfish_dma.cpp (renamed from system/OpenglSystemCommon/goldfish_dma.cpp) | 0 | ||||
| -rw-r--r-- | shared/OpenglCodecCommon/goldfish_dma.h (renamed from system/OpenglSystemCommon/goldfish_dma.h) | 0 | ||||
| -rw-r--r-- | shared/OpenglCodecCommon/gralloc_cb.h (renamed from system/OpenglSystemCommon/gralloc_cb.h) | 0 | ||||
| -rw-r--r-- | shared/OpenglCodecCommon/qemu_pipe.h (renamed from system/OpenglSystemCommon/qemu_pipe.h) | 0 | ||||
| -rw-r--r-- | shared/OpenglCodecCommon/qemu_pipe_host.cpp (renamed from system/OpenglSystemCommon/qemu_pipe_host.cpp) | 0 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/Android.mk | 3 |
7 files changed, 13 insertions, 3 deletions
diff --git a/shared/OpenglCodecCommon/Android.mk b/shared/OpenglCodecCommon/Android.mk index 5097f832..6eddf85b 100644 --- a/shared/OpenglCodecCommon/Android.mk +++ b/shared/OpenglCodecCommon/Android.mk @@ -13,6 +13,19 @@ commonSources := \ SocketStream.cpp \ TcpStream.cpp \ +ifeq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST)) + +commonSources += \ + goldfish_dma_host.cpp \ + qemu_pipe_host.cpp \ + +else + +commonSources += \ + goldfish_dma.cpp \ + +endif + ### CodecCommon guest ############################################## $(call emugl-begin-static-library,libOpenglCodecCommon$(GOLDFISH_OPENGL_LIB_SUFFIX)) diff --git a/system/OpenglSystemCommon/goldfish_dma.cpp b/shared/OpenglCodecCommon/goldfish_dma.cpp index 2d7c298e..2d7c298e 100644 --- a/system/OpenglSystemCommon/goldfish_dma.cpp +++ b/shared/OpenglCodecCommon/goldfish_dma.cpp diff --git a/system/OpenglSystemCommon/goldfish_dma.h b/shared/OpenglCodecCommon/goldfish_dma.h index 1350ace6..1350ace6 100644 --- a/system/OpenglSystemCommon/goldfish_dma.h +++ b/shared/OpenglCodecCommon/goldfish_dma.h diff --git a/system/OpenglSystemCommon/gralloc_cb.h b/shared/OpenglCodecCommon/gralloc_cb.h index 04a70404..04a70404 100644 --- a/system/OpenglSystemCommon/gralloc_cb.h +++ b/shared/OpenglCodecCommon/gralloc_cb.h diff --git a/system/OpenglSystemCommon/qemu_pipe.h b/shared/OpenglCodecCommon/qemu_pipe.h index 4b1aaf22..4b1aaf22 100644 --- a/system/OpenglSystemCommon/qemu_pipe.h +++ b/shared/OpenglCodecCommon/qemu_pipe.h diff --git a/system/OpenglSystemCommon/qemu_pipe_host.cpp b/shared/OpenglCodecCommon/qemu_pipe_host.cpp index b4dc2af2..b4dc2af2 100644 --- a/system/OpenglSystemCommon/qemu_pipe_host.cpp +++ b/shared/OpenglCodecCommon/qemu_pipe_host.cpp diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk index 9071cbe5..a3e7f60b 100644 --- a/system/OpenglSystemCommon/Android.mk +++ b/system/OpenglSystemCommon/Android.mk @@ -12,14 +12,11 @@ LOCAL_SRC_FILES := \ ifeq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST)) LOCAL_SRC_FILES += \ - goldfish_dma_host.cpp \ ThreadInfo_host.cpp \ - qemu_pipe_host.cpp \ else LOCAL_SRC_FILES += \ - goldfish_dma.cpp \ ThreadInfo.cpp \ endif |