From 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 27 Aug 2014 19:01:06 +0200 Subject: emulator/opengl: Cleanup build files + remove obsolete tests. This patch cleans up the build files for the GPU emulation libraries (i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore, filtering is now handled by the build system directly). + Remove a bunch obsolete tests, which were not unit tests, despite their name beginning with ut_xxxx. Which includes removing dependency on SDL too. + Remove -m64 and -fPIC flags from compilation. These are not necessary anymore (again, the build system now takes charge of placing them when necessary), and generated link-time warning when building Windows executables. + Remove a few declarations related to the now-obsolete platform build (these libraries are only built with the emulator's build system now). Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03 --- emulator/opengl/tests/ut_renderer/Renderer.h | 62 ---------------------------- 1 file changed, 62 deletions(-) delete mode 100644 emulator/opengl/tests/ut_renderer/Renderer.h (limited to 'emulator/opengl/tests/ut_renderer/Renderer.h') diff --git a/emulator/opengl/tests/ut_renderer/Renderer.h b/emulator/opengl/tests/ut_renderer/Renderer.h deleted file mode 100644 index 81f4077..0000000 --- a/emulator/opengl/tests/ut_renderer/Renderer.h +++ /dev/null @@ -1,62 +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. -*/ -#ifndef _RENDERER_H_ -#define _RENDERER_H_ -#include -#include "RendererSurface.h" -#include "RendererContext.h" -#include "NativeWindowing.h" -#include "emugl/common/mutex.h" - -class RenderingThread; - -class Renderer { -public: - - class ClientHandle { - public: - unsigned int pid; - unsigned int handle; - ClientHandle(unsigned int _pid, unsigned int _handle) : pid(_pid), handle(_handle) {} - - bool operator< (const ClientHandle & p) const { - bool val = (pid == p.pid) ? handle < p.handle : pid < p.pid; - return val; - } - }; - - static Renderer *instance(); - int createSurface(RenderingThread *thread, const ClientHandle & handle); - int destroySurface(RenderingThread *thread, const ClientHandle &handle); - int createContext(RenderingThread *thread, const ClientHandle & ctx, const ClientHandle shareCtx, int version); - int destroyContext(RenderingThread *thread,const ClientHandle & ctx); - int makeCurrent(RenderingThread *thread, - const ClientHandle & drawSurface, const ClientHandle & readSurface, const ClientHandle & ctx); - int swapBuffers(RenderingThread *thread, const ClientHandle & surface); - -private: - typedef std::map SurfaceMap; - typedef std::map ContextMap; - static Renderer *m_instance; - Renderer(); - SurfaceMap m_surfaces; - ContextMap m_ctxs; - NativeWindowing *m_nw; - EGLDisplay m_dpy; - - emugl::Mutex m_mutex; // single global mutex for the renderer class; -}; -#endif -- cgit v1.1