LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gl3stub.h

Browse Source 
Only define the following before android-L (where new headers define
them already)

  typedef khronos_int64_t  GLint64;
  typedef khronos_uint64_t GLuint64;
  typedef struct __GLsync *GLsync;

Also define L to 9999 for crtbrand.c which needs it to be an integer

Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
This commit is contained in:
Andrew Hsieh
2014-07-17 16:32:05 +08:00
parent 37feee2abc
commit 36dea383df
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h
View File

@@ -14,6 +14,7 @@
*/ */
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <android/api-level.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -54,9 +55,11 @@ GLboolean gl3stubInit();
/* OpenGL ES 3.0 */ /* OpenGL ES 3.0 */
typedef unsigned short GLhalf; typedef unsigned short GLhalf;
#if __ANDROID_API__ <= 19
typedef khronos_int64_t GLint64; typedef khronos_int64_t GLint64;
typedef khronos_uint64_t GLuint64; typedef khronos_uint64_t GLuint64;
typedef struct __GLsync *GLsync; typedef struct __GLsync *GLsync;
#endif
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Token definitions * Token definitions

2
ndk/platforms/common/src/crtbrand.c
View File

@@ -37,6 +37,8 @@ typedef int int32_t[sizeof(int) == 4];
#define ABI_NOTETYPE 1 #define ABI_NOTETYPE 1
#define ABI_ANDROID_API PLATFORM_SDK_VERSION #define ABI_ANDROID_API PLATFORM_SDK_VERSION
#define L 9999
/* /*
* Special ".note" entry to tag an Android binary and specify the ABI version. * Special ".note" entry to tag an Android binary and specify the ABI version.
* *

3
ndk/sources/android/ndk_helper/gl3stub.h
View File

@@ -14,6 +14,7 @@
*/ */
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <android/api-level.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@@ -64,9 +65,11 @@ GLboolean gl3stubInit();
/* OpenGL ES 3.0 */ /* OpenGL ES 3.0 */
typedef unsigned short GLhalf; typedef unsigned short GLhalf;
#if __ANDROID_API__ <= 19
typedef khronos_int64_t GLint64; typedef khronos_int64_t GLint64;
typedef khronos_uint64_t GLuint64; typedef khronos_uint64_t GLuint64;
typedef struct __GLsync *GLsync; typedef struct __GLsync *GLsync;
#endif
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Token definitions * Token definitions