|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -4,4 +4,4 @@
<param name="branch">master</param>
<param name="revision">HEAD</param>
</service>
-</services>
+</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.24.tar.bz2/libhybris/hybris/common/hooks.c
^
|
| @@ -2966,12 +2966,14 @@
#define LINKER_NAME_MM "mm"
#define LINKER_NAME_N "n"
+// These should be in order, such that we don't use for example the jellybean
+// linker for sdk_version > 25 (see __hybris_linker_init below).
#if defined(WANT_LINKER_N)
#define LINKER_NAME_DEFAULT LINKER_NAME_N
-#elif defined(WANT_LINKER_JB)
-#define LINKER_NAME_DEFAULT LINKER_NAME_JB
#elif defined(WANT_LINKER_MM)
#define LINKER_NAME_DEFAULT LINKER_NAME_MM
+#elif defined(WANT_LINKER_JB)
+#define LINKER_NAME_DEFAULT LINKER_NAME_JB
#endif
static int linker_initialized = 0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.24.tar.bz2/libhybris/hybris/egl/platforms/common/eglplatformcommon.cpp
^
|
| @@ -74,7 +74,7 @@
char b[1024];
int bytes_pp = 0;
- if (buf->format == HAL_PIXEL_FORMAT_RGBA_8888)
+ if (buf->format == HAL_PIXEL_FORMAT_RGBA_8888 || buf->format == HAL_PIXEL_FORMAT_BGRA_8888)
bytes_pp = 4;
else if (buf->format == HAL_PIXEL_FORMAT_RGB_565)
bytes_pp = 2;
@@ -116,6 +116,7 @@
*value = EGL_TEXTURE_RGB;
break;
case HAL_PIXEL_FORMAT_RGBA_8888:
+ case HAL_PIXEL_FORMAT_BGRA_8888:
*value = EGL_TEXTURE_RGBA;
break;
default:
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.24.tar.bz2/libhybris/hybris/glesv1/glesv1_cm.c
^
|
| @@ -26,6 +26,8 @@
#include <hybris/common/binding.h>
+#include "../egl/ws.h"
+
#define GLESV1_CM_LIBRARY_PATH "libGLESv1_CM.so"
HYBRIS_LIBRARY_INITIALIZE(glesv1_cm, GLESV1_CM_LIBRARY_PATH);
@@ -187,7 +189,6 @@
HYBRIS_IMPLEMENT_VOID_FUNCTION1(glesv1_cm, glDrawTexxvOES, const GLfixed *);
HYBRIS_IMPLEMENT_VOID_FUNCTION5(glesv1_cm, glDrawTexfOES, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
HYBRIS_IMPLEMENT_VOID_FUNCTION1(glesv1_cm, glDrawTexfvOES, const GLfloat *);
-HYBRIS_IMPLEMENT_VOID_FUNCTION2(glesv1_cm, glEGLImageTargetTexture2DOES, GLenum, GLeglImageOES);
HYBRIS_IMPLEMENT_VOID_FUNCTION2(glesv1_cm, glEGLImageTargetRenderbufferStorageOES, GLenum, GLeglImageOES);
HYBRIS_IMPLEMENT_VOID_FUNCTION2(glesv1_cm, glAlphaFuncxOES, GLenum, GLclampx);
HYBRIS_IMPLEMENT_VOID_FUNCTION4(glesv1_cm, glClearColorxOES, GLclampx, GLclampx, GLclampx, GLclampx);
@@ -304,3 +305,11 @@
HYBRIS_IMPLEMENT_VOID_FUNCTION4(glesv1_cm, glExtGetProgramBinarySourceQCOM, GLuint, GLenum, GLchar *, GLint *);
HYBRIS_IMPLEMENT_VOID_FUNCTION5(glesv1_cm, glStartTilingQCOM, GLuint, GLuint, GLuint, GLuint, GLbitfield);
HYBRIS_IMPLEMENT_VOID_FUNCTION1(glesv1_cm, glEndTilingQCOM, GLbitfield);
+
+void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
+{
+ static void (*_glEGLImageTargetTexture2DOES)(GLenum, GLeglImageOES) FP_ATTRIB = NULL;
+ HYBRIS_DLSYSM(glesv1_cm, &_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES");
+ struct egl_image *img = image;
+ _glEGLImageTargetTexture2DOES(target, img ? img->egl_image : NULL);
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.24.tar.bz2/libhybris/hybris/glesv2/glesv2.c
^
|
| @@ -25,6 +25,8 @@
#include <hybris/common/binding.h>
+#include "../egl/ws.h"
+
static void *_libglesv2 = NULL;
static void (*_glActiveTexture)(GLenum texture) = NULL;
@@ -1044,7 +1046,8 @@
void glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
{
- (*_glEGLImageTargetTexture2DOES)(target, image);
+ struct egl_image *img = image;
+ (*_glEGLImageTargetTexture2DOES)(target, img ? img->egl_image : NULL);
}
|
