[-]
[+]
|
Changed |
_service:tar_git:libhybris.changes
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -1,7 +1,7 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/sledges/libhybris.git</param>
- <param name="branch">update</param>
- <param name="revision">HEAD</param>
+ <param name="url">https://github.com/mer-hybris/libhybris.git</param>
+ <param name="branch">master</param>
+ <param name="revision">0.0.5.2</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/libhybris/.gitignore
^
|
@@ -28,9 +28,42 @@
aclocal-copy
arm-*-linux-gnueabi-libtool
+# Generated .pc, .h and .c files
+hybris/camera/libcamera.pc
+hybris/documentation.list
+hybris/egl/egl.pc
+hybris/egl/platforms/common/hybris-egl-platform.pc
+hybris/egl/platforms/common/wayland-android-client-protocol.h
+hybris/egl/platforms/common/wayland-android-protocol.c
+hybris/egl/platforms/common/wayland-android-server-protocol.h
+hybris/egl/platforms/common/wayland-egl.pc
+hybris/egl/platforms/hwcomposer/hwcomposer-egl.pc
+hybris/glesv1/glesv1_cm.pc
+hybris/glesv2/glesv2.pc
+hybris/hardware/libhardware.pc
+hybris/input/libis.pc
+hybris/libnfc_ndef_nxp/libnfc_ndef_nxp.pc
+hybris/libnfc_nxp/libnfc_nxp.pc
+hybris/libsync/libsync.pc
+hybris/properties/libandroid-properties.pc
+hybris/sf/libsf.pc
+hybris/vibrator/libvibrator.pc
+
+# Util binaries
+hybris/utils/getprop
+hybris/utils/setprop
+
+# Test binaries
+hybris/tests/test_camera
+hybris/tests/test_egl_configs
+hybris/tests/test_gps
+hybris/tests/test_input
+hybris/tests/test_nfc
+hybris/tests/test_sf
hybris/tests/test_egl
hybris/tests/test_glesv2
hybris/tests/test_lights
hybris/tests/test_offscreen_rendering
hybris/tests/test_sensors
hybris/tests/test_ui
+
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/libhybris/hybris/common/hooks.c
^
|
@@ -497,7 +497,7 @@
*((int *)__mutex) = (int) realmutex;
}
- clock_gettime(CLOCK_MONOTONIC_RAW, &tv);
+ clock_gettime(CLOCK_REALTIME, &tv);
tv.tv_sec += __msecs/1000;
tv.tv_nsec += (__msecs % 1000) * 1000000;
if (tv.tv_nsec >= 1000000000) {
@@ -714,7 +714,7 @@
}
struct timespec tv;
- clock_gettime(CLOCK_MONOTONIC_RAW, &tv);
+ clock_gettime(CLOCK_REALTIME, &tv);
tv.tv_sec += reltime->tv_sec;
tv.tv_nsec += reltime->tv_nsec;
if (tv.tv_nsec >= 1000000000) {
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/libhybris/hybris/egl/platforms/wayland/wayland_window.cpp
^
|
@@ -85,12 +85,18 @@
wl_proxy_set_queue((struct wl_proxy *)creation_callback, queue);
}
+void WaylandNativeWindow::resize(unsigned int width, unsigned int height)
+{
+ lock();
+ this->m_defaultWidth = width;
+ this->m_defaultHeight = height;
+ unlock();
+}
+
void WaylandNativeWindow::resize_callback(struct wl_egl_window *egl_window, void *)
{
TRACE("%dx%d",egl_window->width,egl_window->height);
- native_window_set_buffers_dimensions(
- (WaylandNativeWindow*)egl_window->nativewindow,
- egl_window->width,egl_window->height);
+ ((WaylandNativeWindow *) egl_window->nativewindow)->resize(egl_window->width, egl_window->height);
}
void WaylandNativeWindow::free_callback(struct wl_egl_window *egl_window, void *)
@@ -788,8 +794,8 @@
if (m_width != width || m_height != height)
{
TRACE("old-size:%ix%i new-size:%ix%i", m_width, m_height, width, height);
- m_width = m_defaultWidth = width;
- m_height = m_defaultHeight = height;
+ m_width = width;
+ m_height = height;
/* Buffers will be re-allocated when dequeued */
} else {
TRACE("size:%ix%i", width, height);
@@ -870,6 +876,7 @@
ServerWaylandBuffer::ServerWaylandBuffer(unsigned int w, unsigned int h, int f, int u, gralloc_module_t *gralloc, android_wlegl *android_wlegl, struct wl_event_queue *queue)
: WaylandNativeWindowBuffer()
+ , m_buf(0)
{
ANativeWindowBuffer::width = w;
ANativeWindowBuffer::height = h;
@@ -886,6 +893,9 @@
ServerWaylandBuffer::~ServerWaylandBuffer()
{
+ if (m_buf)
+ wl_buffer_destroy(m_buf);
+
m_gralloc->unregisterBuffer(m_gralloc, handle);
native_handle_close(handle);
native_handle_delete(const_cast<native_handle_t *>(handle));
@@ -896,6 +906,7 @@
void ServerWaylandBuffer::init(android_wlegl *, wl_display *, wl_event_queue *queue)
{
wlbuffer = m_buf;
+ m_buf = 0;
wl_proxy_set_queue((struct wl_proxy *) wlbuffer, queue);
}
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/libhybris/hybris/egl/platforms/wayland/wayland_window.h
^
|
@@ -153,6 +153,7 @@
void lock();
void unlock();
void frame();
+ void resize(unsigned int width, unsigned int height);
void releaseBuffer(struct wl_buffer *buffer);
int postBuffer(ANativeWindowBuffer *buffer);
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/upstream/.gitignore
^
|
@@ -28,9 +28,42 @@
aclocal-copy
arm-*-linux-gnueabi-libtool
+# Generated .pc, .h and .c files
+hybris/camera/libcamera.pc
+hybris/documentation.list
+hybris/egl/egl.pc
+hybris/egl/platforms/common/hybris-egl-platform.pc
+hybris/egl/platforms/common/wayland-android-client-protocol.h
+hybris/egl/platforms/common/wayland-android-protocol.c
+hybris/egl/platforms/common/wayland-android-server-protocol.h
+hybris/egl/platforms/common/wayland-egl.pc
+hybris/egl/platforms/hwcomposer/hwcomposer-egl.pc
+hybris/glesv1/glesv1_cm.pc
+hybris/glesv2/glesv2.pc
+hybris/hardware/libhardware.pc
+hybris/input/libis.pc
+hybris/libnfc_ndef_nxp/libnfc_ndef_nxp.pc
+hybris/libnfc_nxp/libnfc_nxp.pc
+hybris/libsync/libsync.pc
+hybris/properties/libandroid-properties.pc
+hybris/sf/libsf.pc
+hybris/vibrator/libvibrator.pc
+
+# Util binaries
+hybris/utils/getprop
+hybris/utils/setprop
+
+# Test binaries
+hybris/tests/test_camera
+hybris/tests/test_egl_configs
+hybris/tests/test_gps
+hybris/tests/test_input
+hybris/tests/test_nfc
+hybris/tests/test_sf
hybris/tests/test_egl
hybris/tests/test_glesv2
hybris/tests/test_lights
hybris/tests/test_offscreen_rendering
hybris/tests/test_sensors
hybris/tests/test_ui
+
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/upstream/hybris/common/hooks.c
^
|
@@ -497,7 +497,7 @@
*((int *)__mutex) = (int) realmutex;
}
- clock_gettime(CLOCK_MONOTONIC_RAW, &tv);
+ clock_gettime(CLOCK_REALTIME, &tv);
tv.tv_sec += __msecs/1000;
tv.tv_nsec += (__msecs % 1000) * 1000000;
if (tv.tv_nsec >= 1000000000) {
@@ -714,7 +714,7 @@
}
struct timespec tv;
- clock_gettime(CLOCK_MONOTONIC_RAW, &tv);
+ clock_gettime(CLOCK_REALTIME, &tv);
tv.tv_sec += reltime->tv_sec;
tv.tv_nsec += reltime->tv_nsec;
if (tv.tv_nsec >= 1000000000) {
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/upstream/hybris/egl/platforms/wayland/wayland_window.cpp
^
|
@@ -85,12 +85,18 @@
wl_proxy_set_queue((struct wl_proxy *)creation_callback, queue);
}
+void WaylandNativeWindow::resize(unsigned int width, unsigned int height)
+{
+ lock();
+ this->m_defaultWidth = width;
+ this->m_defaultHeight = height;
+ unlock();
+}
+
void WaylandNativeWindow::resize_callback(struct wl_egl_window *egl_window, void *)
{
TRACE("%dx%d",egl_window->width,egl_window->height);
- native_window_set_buffers_dimensions(
- (WaylandNativeWindow*)egl_window->nativewindow,
- egl_window->width,egl_window->height);
+ ((WaylandNativeWindow *) egl_window->nativewindow)->resize(egl_window->width, egl_window->height);
}
void WaylandNativeWindow::free_callback(struct wl_egl_window *egl_window, void *)
@@ -788,8 +794,8 @@
if (m_width != width || m_height != height)
{
TRACE("old-size:%ix%i new-size:%ix%i", m_width, m_height, width, height);
- m_width = m_defaultWidth = width;
- m_height = m_defaultHeight = height;
+ m_width = width;
+ m_height = height;
/* Buffers will be re-allocated when dequeued */
} else {
TRACE("size:%ix%i", width, height);
@@ -870,6 +876,7 @@
ServerWaylandBuffer::ServerWaylandBuffer(unsigned int w, unsigned int h, int f, int u, gralloc_module_t *gralloc, android_wlegl *android_wlegl, struct wl_event_queue *queue)
: WaylandNativeWindowBuffer()
+ , m_buf(0)
{
ANativeWindowBuffer::width = w;
ANativeWindowBuffer::height = h;
@@ -884,9 +891,22 @@
android_wlegl_server_buffer_handle_add_listener(ssb, &server_handle_listener, this);
}
+ServerWaylandBuffer::~ServerWaylandBuffer()
+{
+ if (m_buf)
+ wl_buffer_destroy(m_buf);
+
+ m_gralloc->unregisterBuffer(m_gralloc, handle);
+ native_handle_close(handle);
+ native_handle_delete(const_cast<native_handle_t *>(handle));
+ wl_array_release(&ints);
+ wl_array_release(&fds);
+}
+
void ServerWaylandBuffer::init(android_wlegl *, wl_display *, wl_event_queue *queue)
{
wlbuffer = m_buf;
+ m_buf = 0;
wl_proxy_set_queue((struct wl_proxy *) wlbuffer, queue);
}
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.2.tar.bz2/upstream/hybris/egl/platforms/wayland/wayland_window.h
^
|
@@ -132,12 +132,7 @@
{
public:
ServerWaylandBuffer(unsigned int w, unsigned int h, int format, int usage, gralloc_module_t *gralloc, android_wlegl *android_wlegl, struct wl_event_queue *queue);
- ~ServerWaylandBuffer()
- {
- wl_array_release(&ints);
- wl_array_release(&fds);
- }
-
+ ~ServerWaylandBuffer();
void init(struct android_wlegl *android_wlegl,
struct wl_display *display,
struct wl_event_queue *queue);
@@ -158,6 +153,7 @@
void lock();
void unlock();
void frame();
+ void resize(unsigned int width, unsigned int height);
void releaseBuffer(struct wl_buffer *buffer);
int postBuffer(ANativeWindowBuffer *buffer);
|