summaryrefslogtreecommitdiff
path: root/tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-04-18 06:25:38 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-04-18 06:26:17 -0700
commit80d4ba77162126cfb60f9ca75f8a1d3a458ed31f (patch)
tree29d0468049807382c41d85196366fe356d1cab7a /tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp
parent46ead86b0234fd514c7a1adc306ee37de00d59fb (diff)
Move emulator GLES from development.git to sdk.git
The emulator GLES support has two interfaces: a host shared library interface used by QEMU, and a protocol between the platform and the host. The host library interface is not versioned; QEMU and the GLES renderer must match. The protocol on the other hand must be backwards compatible: a new GLES renderer must support an older platform image. Thus for branching purposes it makes more sense to put the GLES renderer in sdk.git, which is branched along with qemu.git for SDK releases. Platform images will be built against the protocol version in the platform branch of sdk.git. Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
Diffstat (limited to 'tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp')
-rw-r--r--tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp39
1 files changed, 0 insertions, 39 deletions
diff --git a/tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp b/tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp
deleted file mode 100644
index 75da8f29f..000000000
--- a/tools/emulator/opengl/system/OpenglSystemCommon/ThreadInfo.cpp
+++ /dev/null
@@ -1,39 +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 "ThreadInfo.h"
-#include "cutils/threads.h"
-
-thread_store_t s_tls = THREAD_STORE_INITIALIZER;
-
-static void tlsDestruct(void *ptr)
-{
- if (ptr) {
- EGLThreadInfo *ti = (EGLThreadInfo *)ptr;
- delete ti->hostConn;
- delete ti;
- }
-}
-
-EGLThreadInfo *slow_getEGLThreadInfo()
-{
- EGLThreadInfo *ti = (EGLThreadInfo *)thread_store_get(&s_tls);
- if (ti) return ti;
-
- ti = new EGLThreadInfo();
- thread_store_set(&s_tls, ti, tlsDestruct);
-
- return ti;
-}