libgui: Split SurfaceTexture tests into more files
Extract the many different test fixtures and suites in SurfaceTexture_test.cpp
into separate files. No real functional changes, just tweaking headers to keep
things building (and adding a few copyright headers I forgot last time).
Change-Id: Id801bd5d617f0cc61d22508fb9b71b41694bdecf
diff --git a/libs/gui/tests/GLTest.h b/libs/gui/tests/GLTest.h
index 5ba1128..d3c4a95 100644
--- a/libs/gui/tests/GLTest.h
+++ b/libs/gui/tests/GLTest.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013 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 ANDROID_GL_TEST_H
#define ANDROID_GL_TEST_H
@@ -11,6 +27,12 @@
namespace android {
class GLTest : public ::testing::Test {
+public:
+ static void loadShader(GLenum shaderType, const char* pSource,
+ GLuint* outShader);
+ static void createProgram(const char* pVertexSource,
+ const char* pFragmentSource, GLuint* outPgm);
+
protected:
GLTest() :
mEglDisplay(EGL_NO_DISPLAY),
@@ -33,11 +55,6 @@
::testing::AssertionResult assertRectEq(const Rect &r1, const Rect &r2,
int tolerance = 1);
- static void loadShader(GLenum shaderType, const char* pSource,
- GLuint* outShader);
- static void createProgram(const char* pVertexSource,
- const char* pFragmentSource, GLuint* outPgm);
-
int mDisplaySecs;
sp<SurfaceComposerClient> mComposerClient;
sp<SurfaceControl> mSurfaceControl;