Eliminate AndroidCommon header and source.

CMakeLists.txt

@@ -631,10 +631,6 @@ file(GLOB_RECURSE OPENGL_COMMON_LIST
     ${OPENGL_DIR}/common/*.hpp
     ${OPENGL_DIR}/include/*.h
 )
-list(REMOVE_ITEM OPENGL_COMMON_LIST
-    ${OPENGL_DIR}/common/AndroidCommon.cpp
-    ${OPENGL_DIR}/common/AndroidCommon.hpp
-)
 
 file(GLOB_RECURSE GL32_LIST
     ${OPENGL_DIR}/libGL/*.cpp

src/Android.mk

@@ -80,7 +80,6 @@ COMMON_SRC_FILES += \
 	Shader/VertexShader.cpp \
 
 COMMON_SRC_FILES += \
-	OpenGL/common/AndroidCommon.cpp \
 	OpenGL/common/Image.cpp \
 	OpenGL/common/NameSpace.cpp \
 	OpenGL/common/Object.cpp \

src/OpenGL/common/AndroidCommon.cpp

-#include "AndroidCommon.hpp"
-
-#include "../../Common/DebugAndroid.hpp"
-
-#include <GLES/glext.h>
-#include <system/graphics.h>
-
-#define GL_RGB565     0x8D62
-#define SW_YV12_BT601 0x32315659   // YCrCb 4:2:0 Planar, 16-byte aligned, BT.601 color space, studio swing
-#define SW_YV12_BT709 0x48315659   // YCrCb 4:2:0 Planar, 16-byte aligned, BT.709 color space, studio swing
-#define SW_YV12_JFIF  0x4A315659   // YCrCb 4:2:0 Planar, 16-byte aligned, BT.601 color space, full swing
-
-GLenum GLPixelFormatFromAndroid(int halFormat)
-{
-	switch(halFormat)
-	{
-	case HAL_PIXEL_FORMAT_RGBA_8888:
-		return GL_RGBA;
-	case HAL_PIXEL_FORMAT_RGBX_8888:
-		return GL_RGB;
-	case HAL_PIXEL_FORMAT_RGB_888:
-		return GL_RGB;
-	case HAL_PIXEL_FORMAT_BGRA_8888:
-		return GL_BGRA_EXT;
-	case HAL_PIXEL_FORMAT_RGB_565:
-		return GL_RGB565;
-	case HAL_PIXEL_FORMAT_YV12:
-		return SW_YV12_BT601;
-	default:
-		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
-	}
-
-	return GL_RGBA;
-}
-
-GLenum GLPixelTypeFromAndroid(int halFormat)
-{
-	switch(halFormat)
-	{
-	case HAL_PIXEL_FORMAT_RGBA_8888:
-	case HAL_PIXEL_FORMAT_RGBX_8888:
-	case HAL_PIXEL_FORMAT_RGB_888:
-	case HAL_PIXEL_FORMAT_BGRA_8888:
-		return GL_UNSIGNED_BYTE;
-	case HAL_PIXEL_FORMAT_RGB_565:
-		return GL_UNSIGNED_SHORT_5_6_5;
-	case HAL_PIXEL_FORMAT_YV12:
-		return GL_UNSIGNED_BYTE;
-	default:
-		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
-	}
-
-	return GL_UNSIGNED_BYTE;
-}

src/OpenGL/common/AndroidCommon.hpp

-#ifndef ANDROID_COMMON
-#define ANDROID_COMMON
-
-#include <GLES/gl.h>
-
-GLenum GLPixelFormatFromAndroid(int format);
-GLenum GLPixelTypeFromAndroid(int format);
-
-#endif  // ANDROID_COMMON

src/OpenGL/common/Image.cpp

@@ -17,7 +17,6 @@
 #include "Common/Math.hpp"
 #include "Common/Thread.hpp"
 
-#include <GLES2/gl2ext.h>
 #include <GLES3/gl3.h>
 
 #include <string.h>

src/OpenGL/common/Image.hpp

@@ -5,12 +5,12 @@
 #include "Renderer/Surface.hpp"
 
 #include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 
 #if defined(__ANDROID__)
 #include <hardware/gralloc.h>
 #include <system/window.h>
 #include "../../Common/GrallocAndroid.hpp"
-#include "../common/AndroidCommon.hpp"
 #include "../../Common/DebugAndroid.hpp"
 #define LOGLOCK(fmt, ...) // ALOGI(fmt " tid=%d", ##__VA_ARGS__, gettid())
 #else
@@ -170,6 +170,49 @@ protected:
 
 #ifdef __ANDROID__
 
+static GLenum GLPixelFormatFromAndroid(int halFormat)
+{
+	switch(halFormat)
+	{
+	case HAL_PIXEL_FORMAT_RGBA_8888:
+		return GL_RGBA;
+	case HAL_PIXEL_FORMAT_RGBX_8888:
+		return GL_RGB;
+	case HAL_PIXEL_FORMAT_RGB_888:
+		return GL_RGB;
+	case HAL_PIXEL_FORMAT_BGRA_8888:
+		return GL_BGRA_EXT;
+	case HAL_PIXEL_FORMAT_RGB_565:
+		return GL_RGB565;
+	case HAL_PIXEL_FORMAT_YV12:
+		return SW_YV12_BT601;
+	default:
+		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
+	}
+
+	return GL_RGBA;
+}
+
+static GLenum GLPixelTypeFromAndroid(int halFormat)
+{
+	switch(halFormat)
+	{
+	case HAL_PIXEL_FORMAT_RGBA_8888:
+	case HAL_PIXEL_FORMAT_RGBX_8888:
+	case HAL_PIXEL_FORMAT_RGB_888:
+	case HAL_PIXEL_FORMAT_BGRA_8888:
+		return GL_UNSIGNED_BYTE;
+	case HAL_PIXEL_FORMAT_RGB_565:
+		return GL_UNSIGNED_SHORT_5_6_5;
+	case HAL_PIXEL_FORMAT_YV12:
+		return GL_UNSIGNED_BYTE;
+	default:
+		ALOGE("%s badness unsupported HAL format=%x", __FUNCTION__, halFormat);
+	}
+
+	return GL_UNSIGNED_BYTE;
+}
+
 class AndroidNativeImage : public egl::Image
 {
 public: