diff options
author | Jesse Hall <jessehall@google.com> | 2012-05-30 15:24:06 -0700 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2012-06-06 09:39:32 -0700 |
commit | 3d1eacc2a657b024587bbf6f369f073c4daa36be (patch) | |
tree | abba23f534e16ced6f64cd386c00328567db56eb /emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp | |
parent | 455038d1740083aa5e2b5b0ec852cd81bcc9ce1e (diff) | |
download | sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.zip sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.gz sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.bz2 |
Move emugl system code to development.git
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.
A few changes were made beyond simply cloning the directories:
(a) Makefiles were modified to only build the relevant components. Not
doing so would break the build due to having multiple rule
definitions.
(b) Protocol spec files were moved from the guest encoder directories
to the host decoder directories. The decoder must support older
versions of the protocol, but not newer versions, so it makes
sense to keep the latest version of the protocol spec with the
decoder.
(c) Along with that, the encoder is now built from checked in
generated encoder source rather than directly from the protocol
spec. The generated code must be updated manually. This makes it
possible to freeze the system encoder version without freezing the
host decoder version, and also makes it very obvious when a
protocol changes is happening that will require special
backwards-compatibility support in the decoder/renderer.
(d) Host-only and system-only code were removed from the repository
where they aren't used.
(e) README and DESIGN documents were updated to reflect this split.
No actual source code was changed due to the above.
Change-Id: I70b576a70ac3dc94155f931508b152178f1e8cd5
Diffstat (limited to 'emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp')
-rw-r--r-- | emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp b/emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp deleted file mode 100644 index 940f5ae..0000000 --- a/emulator/opengl/system/OpenglSystemCommon/HostConnection.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* -* Copyright (C) 2011 The Android Open Source Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -#include "HostConnection.h" -#include "TcpStream.h" -#include "QemuPipeStream.h" -#include "ThreadInfo.h" -#include <cutils/log.h> -#include "GLEncoder.h" -#include "GL2Encoder.h" - -#define STREAM_BUFFER_SIZE 4*1024*1024 -#define STREAM_PORT_NUM 22468 - -/* Set to 1 to use a QEMU pipe, or 0 for a TCP connection */ -#define USE_QEMU_PIPE 1 - -HostConnection::HostConnection() : - m_stream(NULL), - m_glEnc(NULL), - m_gl2Enc(NULL), - m_rcEnc(NULL) -{ -} - -HostConnection::~HostConnection() -{ - delete m_stream; - delete m_glEnc; - delete m_gl2Enc; - delete m_rcEnc; -} - -HostConnection *HostConnection::get() -{ - /* TODO: Make this configurable with a system property */ - const int useQemuPipe = USE_QEMU_PIPE; - - // Get thread info - EGLThreadInfo *tinfo = getEGLThreadInfo(); - if (!tinfo) { - return NULL; - } - - if (tinfo->hostConn == NULL) { - HostConnection *con = new HostConnection(); - if (NULL == con) { - return NULL; - } - - if (useQemuPipe) { - QemuPipeStream *stream = new QemuPipeStream(STREAM_BUFFER_SIZE); - if (!stream) { - ALOGE("Failed to create QemuPipeStream for host connection!!!\n"); - delete con; - return NULL; - } - if (stream->connect() < 0) { - ALOGE("Failed to connect to host (QemuPipeStream)!!!\n"); - delete stream; - delete con; - return NULL; - } - con->m_stream = stream; - } - else /* !useQemuPipe */ - { - TcpStream *stream = new TcpStream(STREAM_BUFFER_SIZE); - if (!stream) { - ALOGE("Failed to create TcpStream for host connection!!!\n"); - delete con; - return NULL; - } - - if (stream->connect("10.0.2.2", STREAM_PORT_NUM) < 0) { - ALOGE("Failed to connect to host (TcpStream)!!!\n"); - delete stream; - delete con; - return NULL; - } - con->m_stream = stream; - } - - // send zero 'clientFlags' to the host. - unsigned int *pClientFlags = - (unsigned int *)con->m_stream->allocBuffer(sizeof(unsigned int)); - *pClientFlags = 0; - con->m_stream->commitBuffer(sizeof(unsigned int)); - - ALOGD("HostConnection::get() New Host Connection established %p, tid %d\n", con, gettid()); - tinfo->hostConn = con; - } - - return tinfo->hostConn; -} - -GLEncoder *HostConnection::glEncoder() -{ - if (!m_glEnc) { - m_glEnc = new GLEncoder(m_stream); - DBG("HostConnection::glEncoder new encoder %p, tid %d", m_glEnc, gettid()); - m_glEnc->setContextAccessor(s_getGLContext); - } - return m_glEnc; -} - -GL2Encoder *HostConnection::gl2Encoder() -{ - if (!m_gl2Enc) { - m_gl2Enc = new GL2Encoder(m_stream); - DBG("HostConnection::gl2Encoder new encoder %p, tid %d", m_gl2Enc, gettid()); - m_gl2Enc->setContextAccessor(s_getGL2Context); - } - return m_gl2Enc; -} - -renderControl_encoder_context_t *HostConnection::rcEncoder() -{ - if (!m_rcEnc) { - m_rcEnc = new renderControl_encoder_context_t(m_stream); - } - return m_rcEnc; -} - -gl_client_context_t *HostConnection::s_getGLContext() -{ - EGLThreadInfo *ti = getEGLThreadInfo(); - if (ti->hostConn) { - return ti->hostConn->m_glEnc; - } - return NULL; -} - -gl2_client_context_t *HostConnection::s_getGL2Context() -{ - EGLThreadInfo *ti = getEGLThreadInfo(); - if (ti->hostConn) { - return ti->hostConn->m_gl2Enc; - } - return NULL; -} |