From 6ef57d7b368ebbac5f2b27c36a9032fee1cda8b1 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Wed, 5 Mar 2014 15:06:53 -0800 Subject: Restore old OpenGL tests These tests call android_createDisplaySurface() to get a FramebufferNativeWindow that is passed to EGL. This relies on the existence of the framebuffer HAL, which is not supported on many recent devices. This change adds a new "window surface" object that the tests can use to get a window from SurfaceFlinger instead. All tests except for the HWC tests now appear to do things. The HWC tests don't do anything useful, but they no longer depend on the android_createDisplaySurface() function. Bug 13323813 Change-Id: I2cbfbacb3452fb658c29e945b0c7ae7c94c1a4ba --- opengl/tests/include/WindowSurface.h | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 opengl/tests/include/WindowSurface.h (limited to 'opengl/tests/include') diff --git a/opengl/tests/include/WindowSurface.h b/opengl/tests/include/WindowSurface.h new file mode 100644 index 0000000..0ec1404 --- /dev/null +++ b/opengl/tests/include/WindowSurface.h @@ -0,0 +1,49 @@ +/* + * Copyright 2014 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 OPENGL_TESTS_WINDOWSURFACE_H +#define OPENGL_TESTS_WINDOWSURFACE_H + +#include + +#include + +namespace android { + +/* + * A window that covers the entire display surface. + * + * The window is destroyed when this object is destroyed, so don't try + * to use the surface after that point. + */ +class WindowSurface { +public: + // Creates the window. + WindowSurface(); + + // Retrieves a handle to the window. + EGLNativeWindowType getSurface() const; + +private: + WindowSurface(const WindowSurface&); + WindowSurface& operator=(const WindowSurface&); + + sp mSurfaceControl; +}; + +} // namespace android + +#endif /* OPENGL_TESTS_WINDOWSURFACE_H */ -- cgit v1.1