Fixes for JBMR1

Remove references to JBMR2+ HAL pixel formats. We don't support them anyway. Link EGL against LLVM. This happens because there are some dependencies in the android_top libraries. I suspect it's happening because we link per-file, not per-function. Change-Id: Ibc37d3fcbe9967fcffdaa35e07d4cc654c13d46e Reviewed-on: https://swiftshader-review.googlesource.com/3150Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Greg Hartman <ghartman@google.com>

Fixes for JBMR1
dcf1d858 · Greg Hartman · eafdb22c · dcf1d858 · dcf1d858
Commit dcf1d858 authored May 15, 2015 by Greg Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

AndroidCommon.cpp src/OpenGL/common/AndroidCommon.cpp +0 -6

Android.mk src/OpenGL/libEGL/Android.mk +2 -1

No files found.
--- a/src/OpenGL/common/AndroidCommon.cpp
+++ b/src/OpenGL/common/AndroidCommon.cpp
@@ -35,12 +35,9 @@ GLenum getColorFormatFromAndroid(int format)
            return GL_RGB565_OES;
 #endif
        case HAL_PIXEL_FORMAT_YV12:
-        case HAL_PIXEL_FORMAT_Y8:
-        case HAL_PIXEL_FORMAT_Y16:
        case HAL_PIXEL_FORMAT_RAW_SENSOR:
        case HAL_PIXEL_FORMAT_BLOB:
        case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
-        case HAL_PIXEL_FORMAT_YCbCr_420_888:
        default:
 			ALOGE("%s badness unsupported format=%x", __FUNCTION__, format);
    }
@@ -70,12 +67,9 @@ GLenum getPixelFormatFromAndroid(int format)
            return GL_UNSIGNED_SHORT_5_6_5;
 #endif
        case HAL_PIXEL_FORMAT_YV12:
-        case HAL_PIXEL_FORMAT_Y8:
-        case HAL_PIXEL_FORMAT_Y16:
        case HAL_PIXEL_FORMAT_RAW_SENSOR:
        case HAL_PIXEL_FORMAT_BLOB:
        case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
-        case HAL_PIXEL_FORMAT_YCbCr_420_888:
        default:
 			ALOGE("%s badness unsupported format=%x", __FUNCTION__, format);
    }

--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -4,7 +4,8 @@ COMMON_CFLAGS := \
 	-DLOG_TAG=\"libEGL_swiftshader\" \
 	-std=c++11 \
 	-DEGLAPI= \
-	-DEGL_EGLEXT_PROTOTYPES
+	-DEGL_EGLEXT_PROTOTYPES \
+	-Wno-unused-parameter
 COMMON_SRC_FILES := \
 	Config.cpp \