| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 9e88aa086083b80c05b2bf057b92682186c4e6dc Mon Sep 17 00:00:00 2001 |
| 2 | From: Balint Reczey <balint@balintreczey.hu> |
| 3 | Date: Thu, 6 Oct 2016 18:12:18 +0200 |
| 4 | Subject: [PATCH 12/12] Revert "[droid] fix builds with AML disabled" |
| 5 | |
| 6 | This reverts commit 4733383b8f1c1dd0b95e9e5358425d8a0b7ba8fc. |
| 7 | --- |
| 8 | xbmc/utils/SystemInfo.cpp | 4 ---- |
| 9 | xbmc/windowing/egl/EGLWrapper.cpp | 16 ++++++---------- |
| 10 | 2 files changed, 6 insertions(+), 14 deletions(-) |
| 11 | |
| 12 | diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp |
| 13 | index fcc6733..52e7fa3 100644 |
| 14 | --- a/xbmc/utils/SystemInfo.cpp |
| 15 | +++ b/xbmc/utils/SystemInfo.cpp |
| 16 | @@ -57,10 +57,8 @@ |
| 17 | #include "utils/XMLUtils.h" |
| 18 | #if defined(TARGET_ANDROID) |
| 19 | #include "platform/android/jni/Build.h" |
| 20 | -#if defined(HAS_LIBAMCODEC) |
| 21 | #include "utils/AMLUtils.h" |
| 22 | #endif |
| 23 | -#endif |
| 24 | |
| 25 | /* Platform identification */ |
| 26 | #if defined(TARGET_DARWIN) |
| 27 | @@ -873,11 +871,9 @@ bool CSysInfo::IsAeroDisabled() |
| 28 | bool CSysInfo::HasHW3DInterlaced() |
| 29 | { |
| 30 | #if defined(TARGET_ANDROID) |
| 31 | -#if defined(HAS_LIBAMCODEC) |
| 32 | if (aml_hw3d_present()) |
| 33 | return true; |
| 34 | #endif |
| 35 | -#endif |
| 36 | return false; |
| 37 | } |
| 38 | |
| 39 | diff --git a/xbmc/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp |
| 40 | index 30f5757..583d43a 100644 |
| 41 | --- a/xbmc/windowing/egl/EGLWrapper.cpp |
| 42 | +++ b/xbmc/windowing/egl/EGLWrapper.cpp |
| 43 | @@ -24,19 +24,15 @@ |
| 44 | #include <assert.h> |
| 45 | #if defined(TARGET_ANDROID) |
| 46 | #include "EGLNativeTypeAndroid.h" |
| 47 | -#if defined(HAS_LIBAMCODEC) |
| 48 | #include "EGLNativeTypeAmlAndroid.h" |
| 49 | #endif |
| 50 | -#endif |
| 51 | #if defined(TARGET_RASPBERRY_PI) |
| 52 | #include "EGLNativeTypeRaspberryPI.h" |
| 53 | #endif |
| 54 | #if defined(HAS_IMXVPU) |
| 55 | #include "EGLNativeTypeIMX.h" |
| 56 | #endif |
| 57 | -#if defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC) |
| 58 | #include "EGLNativeTypeAmlogic.h" |
| 59 | -#endif |
| 60 | #include "EGLWrapper.h" |
| 61 | |
| 62 | #define CheckError() m_result = eglGetError(); if(m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result); |
| 63 | @@ -91,15 +87,15 @@ bool CEGLWrapper::Initialize(const std::string &implementation) |
| 64 | // Try to create each backend in sequence and go with the first one |
| 65 | // that we know will work |
| 66 | if ( |
| 67 | -#if defined(TARGET_ANDROID) && defined(HAS_LIBAMCODEC) |
| 68 | - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) |
| 69 | -#elif defined(TARGET_ANDROID) |
| 70 | - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) |
| 71 | -#elif defined(TARGET_RASPBERRY_PI) |
| 72 | +#if defined(TARGET_ANDROID) |
| 73 | + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) || |
| 74 | + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) || |
| 75 | +#endif |
| 76 | +#if defined(TARGET_RASPBERRY_PI) |
| 77 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeRaspberryPI>(implementation)) |
| 78 | #elif defined(HAS_IMXVPU) |
| 79 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeIMX>(implementation)) |
| 80 | -#elif defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC) |
| 81 | +#else |
| 82 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlogic>(implementation)) |
| 83 | #endif |
| 84 | ) |
| 85 | -- |
| 86 | 2.10.2 |
| 87 | |