diff options
author | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
commit | 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced (patch) | |
tree | dd49d80843e153f72f8003561c893015478d67a1 /emulator/opengl/tests/ut_renderer/RendererSurface.h | |
parent | 956b01fd91a6a576e8c8e35b2d608408e866c5da (diff) | |
download | sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.zip sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.gz sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.bz2 |
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
Diffstat (limited to 'emulator/opengl/tests/ut_renderer/RendererSurface.h')
-rw-r--r-- | emulator/opengl/tests/ut_renderer/RendererSurface.h | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/emulator/opengl/tests/ut_renderer/RendererSurface.h b/emulator/opengl/tests/ut_renderer/RendererSurface.h deleted file mode 100644 index 4f6709c..0000000 --- a/emulator/opengl/tests/ut_renderer/RendererSurface.h +++ /dev/null @@ -1,52 +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_SURFACE_H_ -#define _RENDERER_SURFACE_H_ - -#include <EGL/egl.h> -#include "NativeWindowing.h" -#include "RendererObject.h" - -#define DEFAULT_HEIGHT 480 -#define DEFAULT_WIDTH 320 - -class RendererSurface : public RendererObject { -public: - typedef enum { CONFIG_DEPTH = 1 << 0 } SurfaceConfig; - - EGLSurface eglSurface() { return m_eglSurface; } - EGLConfig eglConfig() { return m_config; } - EGLDisplay eglDisplay() { return m_eglDisplay; } - - static RendererSurface * create(EGLDisplay eglDisplay, SurfaceConfig config, NativeWindowing *nw); - static EGLConfig getEglConfig(EGLDisplay eglDisplay, SurfaceConfig config); - - int destroy(NativeWindowing *nw); - -private: - RendererSurface(EGLDisplay display, NativeWindowType window, EGLSurface surface, EGLConfig config) : - m_eglDisplay(display), - m_config(config), - m_window(window), - m_eglSurface(surface) - {} - - EGLDisplay m_eglDisplay; - EGLConfig m_config; - NativeWindowType m_window; - EGLSurface m_eglSurface; -}; -#endif |