Eliminate AndroidCommon header and source.
Change-Id: I3983513f09f70b36ab506b3c405aa347df2f36b9
Reviewed-on: https://swiftshader-review.googlesource.com/4490
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8a12b2..97bd0fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -631,10 +631,6 @@
${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
diff --git a/src/Android.mk b/src/Android.mk
index 4abc980..69bb32a 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -80,7 +80,6 @@
Shader/VertexShader.cpp \
COMMON_SRC_FILES += \
- OpenGL/common/AndroidCommon.cpp \
OpenGL/common/Image.cpp \
OpenGL/common/NameSpace.cpp \
OpenGL/common/Object.cpp \
diff --git a/src/OpenGL/common/AndroidCommon.cpp b/src/OpenGL/common/AndroidCommon.cpp
deleted file mode 100644
index 0d11ce6..0000000
--- a/src/OpenGL/common/AndroidCommon.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#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;
-}
diff --git a/src/OpenGL/common/AndroidCommon.hpp b/src/OpenGL/common/AndroidCommon.hpp
deleted file mode 100644
index 6112970..0000000
--- a/src/OpenGL/common/AndroidCommon.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef ANDROID_COMMON
-#define ANDROID_COMMON
-
-#include <GLES/gl.h>
-
-GLenum GLPixelFormatFromAndroid(int format);
-GLenum GLPixelTypeFromAndroid(int format);
-
-#endif // ANDROID_COMMON
diff --git a/src/OpenGL/common/Image.cpp b/src/OpenGL/common/Image.cpp
index 748c262..85ebe9a 100644
--- a/src/OpenGL/common/Image.cpp
+++ b/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>
diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index abd2d5f..a82dc1c 100644
--- a/src/OpenGL/common/Image.hpp
+++ b/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 @@
#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: