summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetar Jovanovic <petar.jovanovic@imgtec.com>2013-06-05 13:08:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-05 13:08:09 -0700
commitce4f740ce0a376c6d2942d8fb99acec2c3a864ad (patch)
treed0c2797379a505fc33b006c36036df0454847cf7
parent8bf2a8aea4a8a6f597bed67b8c6f63d1df5f2a27 (diff)
parent1b87456faa939b8a76a54336818131fb72b85ca6 (diff)
downloadandroid_device_generic_goldfish-ce4f740ce0a376c6d2942d8fb99acec2c3a864ad.tar.gz
android_device_generic_goldfish-ce4f740ce0a376c6d2942d8fb99acec2c3a864ad.tar.bz2
android_device_generic_goldfish-ce4f740ce0a376c6d2942d8fb99acec2c3a864ad.zip
am 1b87456f: Flush QemuPipeStream when needed
* commit '1b87456faa939b8a76a54336818131fb72b85ca6': Flush QemuPipeStream when needed
-rw-r--r--opengl/system/OpenglSystemCommon/QemuPipeStream.cpp1
-rw-r--r--opengl/system/renderControl_enc/renderControl_enc.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
index 50c3d8b..a55dca0 100644
--- a/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/opengl/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -40,6 +40,7 @@ QemuPipeStream::QemuPipeStream(int sock, size_t bufSize) :
QemuPipeStream::~QemuPipeStream()
{
if (m_sock >= 0) {
+ flush();
::close(m_sock);
}
if (m_buf != NULL) {
diff --git a/opengl/system/renderControl_enc/renderControl_enc.cpp b/opengl/system/renderControl_enc/renderControl_enc.cpp
index 94e256a..41f59d0 100644
--- a/opengl/system/renderControl_enc/renderControl_enc.cpp
+++ b/opengl/system/renderControl_enc/renderControl_enc.cpp
@@ -311,6 +311,8 @@ void rcCloseColorBuffer_enc(void *self , uint32_t colorbuffer)
memcpy(ptr, &packetSize, 4); ptr += 4;
memcpy(ptr, &colorbuffer, 4); ptr += 4;
+
+ stream->flush();
}
void rcSetWindowColorBuffer_enc(void *self , uint32_t windowSurface, uint32_t colorBuffer)