[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.spec
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.20.tar.bz2/hwcomposer/hwcomposer_backend.cpp
^
|
@@ -82,7 +82,7 @@
// the hardware composer one. Therefor we rely on using the fbdev HYBRIS_EGLPLATFORM
// here and use eglGetDisplay to initialize it.
if (qEnvironmentVariableIsEmpty("QT_QPA_NO_FRAMEBUFFER_FIRST")) {
- eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ eglGetDisplay(EGL_DEFAULT_DISPLAY);
}
// A reason for calling this method here is to initialize the binder
@@ -94,94 +94,98 @@
libminisf = android_dlopen("libminisf.so", RTLD_LAZY);
if (libminisf) {
- startMiniSurfaceFlinger = (void(*)(void))android_dlsym(libminisf, "startMiniSurfaceFlinger");
+ startMiniSurfaceFlinger = (void(*)(void))android_dlsym(libminisf, "startMiniSurfaceFlinger");
}
if (startMiniSurfaceFlinger) {
- startMiniSurfaceFlinger();
+ startMiniSurfaceFlinger();
} else {
- fprintf(stderr, "libminisf is incompatible or missing. Can not possibly start the SurfaceFlinger service. If you're experiencing troubles with media try updating droidmedia (and/or this plugin).");
+ fprintf(stderr, "libminisf is incompatible or missing. Can not possibly start the SurfaceFlinger service. If you're experiencing troubles with media try updating droidmedia (and/or this plugin).");
}
// Open hardware composer
- HWC_PLUGIN_ASSERT_ZERO(hw_get_module(HWC_HARDWARE_MODULE_ID, (const hw_module_t **)(&hwc_module)));
-
- fprintf(stderr, "== hwcomposer module ==\n");
- fprintf(stderr, " * Address: %p\n", hwc_module);
- fprintf(stderr, " * Module API Version: %x\n", hwc_module->module_api_version);
- fprintf(stderr, " * HAL API Version: %x\n", hwc_module->hal_api_version); /* should be zero */
- fprintf(stderr, " * Identifier: %s\n", hwc_module->id);
- fprintf(stderr, " * Name: %s\n", hwc_module->name);
- fprintf(stderr, " * Author: %s\n", hwc_module->author);
- fprintf(stderr, "== hwcomposer module ==\n");
-
- // Open hardware composer device
- HWC_PLUGIN_ASSERT_ZERO(hwc_module->methods->open(hwc_module, HWC_HARDWARE_COMPOSER, &hwc_device));
-
- uint32_t version = interpreted_version(hwc_device);
-
- fprintf(stderr, "== hwcomposer device ==\n");
- fprintf(stderr, " * Version: %x (interpreted as %x)\n", hwc_device->version, version);
- fprintf(stderr, " * Module: %p\n", hwc_device->module);
- fprintf(stderr, "== hwcomposer device ==\n");
+ if (hw_get_module(HWC_HARDWARE_MODULE_ID, (const hw_module_t **)(&hwc_module)) == 0) {
+ fprintf(stderr, "== hwcomposer module ==\n");
+ fprintf(stderr, " * Address: %p\n", hwc_module);
+ fprintf(stderr, " * Module API Version: %x\n", hwc_module->module_api_version);
+ fprintf(stderr, " * HAL API Version: %x\n", hwc_module->hal_api_version); /* should be zero */
+ fprintf(stderr, " * Identifier: %s\n", hwc_module->id);
+ fprintf(stderr, " * Name: %s\n", hwc_module->name);
+ fprintf(stderr, " * Author: %s\n", hwc_module->author);
+ fprintf(stderr, "== hwcomposer module ==\n");
+
+ // Open hardware composer device
+ HWC_PLUGIN_ASSERT_ZERO(hwc_module->methods->open(hwc_module, HWC_HARDWARE_COMPOSER, &hwc_device));
+
+ uint32_t version = interpreted_version(hwc_device);
+
+ fprintf(stderr, "== hwcomposer device ==\n");
+ fprintf(stderr, " * Version: %x (interpreted as %x)\n", hwc_device->version, version);
+ fprintf(stderr, " * Module: %p\n", hwc_device->module);
+ fprintf(stderr, "== hwcomposer device ==\n");
#ifdef HWC_DEVICE_API_VERSION_0_1
- // Special-case for old hw adaptations that have the version encoded in
- // legacy format, we have to check hwc_device->version directly, because
- // the constants are actually encoded in the old format
- if ((hwc_device->version == HWC_DEVICE_API_VERSION_0_1) ||
- (hwc_device->version == HWC_DEVICE_API_VERSION_0_2) ||
- (hwc_device->version == HWC_DEVICE_API_VERSION_0_3)) {
- return new HwComposerBackend_v0(hwc_module, hwc_device, libminisf);
- }
+ // Special-case for old hw adaptations that have the version encoded in
+ // legacy format, we have to check hwc_device->version directly, because
+ // the constants are actually encoded in the old format
+ if ((hwc_device->version == HWC_DEVICE_API_VERSION_0_1) ||
+ (hwc_device->version == HWC_DEVICE_API_VERSION_0_2) ||
+ (hwc_device->version == HWC_DEVICE_API_VERSION_0_3)) {
+ return new HwComposerBackend_v0(hwc_module, hwc_device, libminisf);
+ }
#endif
- // Determine which backend we use based on the supported module API version
- switch (version) {
+ // Determine which backend we use based on the supported module API version
+ switch (version) {
#ifdef HWC_DEVICE_API_VERSION_0_1
- case HWC_DEVICE_API_VERSION_0_1:
- case HWC_DEVICE_API_VERSION_0_2:
- case HWC_DEVICE_API_VERSION_0_3:
- return new HwComposerBackend_v0(hwc_module, hwc_device, libminisf);
- break;
+ case HWC_DEVICE_API_VERSION_0_1:
+ case HWC_DEVICE_API_VERSION_0_2:
+ case HWC_DEVICE_API_VERSION_0_3:
+ return new HwComposerBackend_v0(hwc_module, hwc_device, libminisf);
#endif
#ifdef HWC_DEVICE_API_VERSION_1_0
- case HWC_DEVICE_API_VERSION_1_0:
- return new HwComposerBackend_v10(hwc_module, hwc_device, libminisf);
- break;
+ case HWC_DEVICE_API_VERSION_1_0:
+ return new HwComposerBackend_v10(hwc_module, hwc_device, libminisf);
#endif /* HWC_DEVICE_API_VERSION_1_0 */
#ifdef HWC_PLUGIN_HAVE_HWCOMPOSER1_API
- case HWC_DEVICE_API_VERSION_1_1:
+ case HWC_DEVICE_API_VERSION_1_1:
#ifdef HWC_DEVICE_API_VERSION_1_2
- case HWC_DEVICE_API_VERSION_1_2:
+ case HWC_DEVICE_API_VERSION_1_2:
#endif
#ifdef HWC_DEVICE_API_VERSION_1_3
- case HWC_DEVICE_API_VERSION_1_3:
+ case HWC_DEVICE_API_VERSION_1_3:
#endif
#ifdef HWC_DEVICE_API_VERSION_1_4
- case HWC_DEVICE_API_VERSION_1_4:
+ case HWC_DEVICE_API_VERSION_1_4:
#endif
#ifdef HWC_DEVICE_API_VERSION_1_5
- case HWC_DEVICE_API_VERSION_1_5:
+ case HWC_DEVICE_API_VERSION_1_5:
#endif
- // HWC_NUM_DISPLAY_TYPES is the actual size of the array, otherwise
- // underrun/overruns happen
- return new HwComposerBackend_v11(hwc_module, hwc_device, libminisf, HWC_NUM_DISPLAY_TYPES);
- break;
+ // HWC_NUM_DISPLAY_TYPES is the actual size of the array, otherwise
+ // underrun/overruns happen
+ return new HwComposerBackend_v11(hwc_module, hwc_device, libminisf, HWC_NUM_DISPLAY_TYPES);
#endif /* HWC_PLUGIN_HAVE_HWCOMPOSER1_API */
#ifdef HWC_PLUGIN_HAVE_HWCOMPOSER2_API
- case HWC_DEVICE_API_VERSION_2_0:
- return new HwComposerBackend_v20(hwc_module, libminisf);
- break;
-#endif
- default:
- fprintf(stderr, "Unknown hwcomposer API: 0x%x/0x%x/0x%x\n",
- hwc_module->module_api_version,
- hwc_device->version,
- version);
- return NULL;
- break;
+ case HWC_DEVICE_API_VERSION_2_0:
+ return new HwComposerBackend_v20(NULL, libminisf);
+#endif
+ default:
+ fprintf(stderr, "Unknown hwcomposer API: 0x%x/0x%x/0x%x\n",
+ hwc_module->module_api_version,
+ hwc_device->version,
+ version);
+ return NULL;
+ }
}
+#ifdef HWC_PLUGIN_HAVE_HWCOMPOSER2_API
+ else {
+ // Create hwc2 backend directly if opening hardware module fails
+ return new HwComposerBackend_v20(NULL, libminisf);
+ }
+#endif
+
+ fprintf(stderr, "Unable to load hwcomposer module\n");
+ return NULL;
}
void
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.20.tar.bz2/hwcomposer/hwcomposer_backend.h
^
|
@@ -42,6 +42,7 @@
#ifndef HWCOMPOSER_BACKEND_H
#define HWCOMPOSER_BACKEND_H
+#include <inttypes.h>
#include <sys/types.h>
#include <sync/sync.h>
#include <stdint.h>
@@ -65,7 +66,7 @@
// Evaluate "x", if it isn't NULL, print a warning
#define HWC_PLUGIN_EXPECT_NULL(x) \
{ void *res; if ((res = (x)) != NULL) \
- qWarning("QPA-HWC: %s in %s returned %x", (#x), __func__, (intptr_t)res); }
+ qWarning("QPA-HWC: %s in %s returned %" PRIxPTR, (#x), __func__, (intptr_t)res); }
// Evaluate "x", if it is NULL, exit with a fatal error
#define HWC_PLUGIN_FATAL(x) \
@@ -74,7 +75,7 @@
// Evaluate "x", if it is NULL, exit with a fatal error
#define HWC_PLUGIN_ASSERT_NOT_NULL(x) \
{ void *res; if ((res = (x)) == NULL) \
- qFatal("QPA-HWC: %s in %s returned %x", (#x), __func__, (intptr_t)res); }
+ qFatal("QPA-HWC: %s in %s returned %" PRIxPTR, (#x), __func__, (intptr_t)res); }
// Evaluate "x", if it doesn't return zero, exit with a fatal error
#define HWC_PLUGIN_ASSERT_ZERO(x) \
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.20.tar.bz2/hwcomposer/hwcomposer_backend_v10.cpp
^
|
@@ -41,6 +41,7 @@
#include "hwcomposer_backend_v10.h"
+#include <inttypes.h>
#include <unistd.h>
#ifdef HWC_DEVICE_API_VERSION_1_0
@@ -91,14 +92,14 @@
fprintf(stderr, "dpy = %p\n", contents->dpy);
fprintf(stderr, "sur = %p\n", contents->sur);
fprintf(stderr, "flags = %x\n", contents->flags);
- fprintf(stderr, "numHwLayers = %d\n", contents->numHwLayers);
- for (int i=0; i<contents->numHwLayers; i++) {
+ fprintf(stderr, "numHwLayers = %zu\n", contents->numHwLayers);
+ for (unsigned int i=0; i<contents->numHwLayers; i++) {
hwc_layer_1_t *layer = &(contents->hwLayers[i]);
fprintf(stderr, "Layer %d (%p):\n"
- " type=%s, hints=%x, flags=%x, handle=%x, transform=%d, blending=%s\n"
+ " type=%s, hints=%x, flags=%x, handle=%" PRIxPTR ", transform=%d, blending=%s\n"
" sourceCrop={%d, %d, %d, %d}, displayFrame={%d, %d, %d, %d}\n"
- " visibleRegionScreen=<%d rect(s)>, acquireFenceFd=%d, releaseFenceFd=%d\n",
- i, layer, comp_type_str(layer->compositionType), layer->hints, layer->flags, layer->handle,
+ " visibleRegionScreen=<%zu rect(s)>, acquireFenceFd=%d, releaseFenceFd=%d\n",
+ i, layer, comp_type_str(layer->compositionType), layer->hints, layer->flags, (uintptr_t)layer->handle,
layer->transform, blending_type_str(layer->blending),
layer->sourceCrop.left, layer->sourceCrop.top, layer->sourceCrop.right, layer->sourceCrop.bottom,
layer->displayFrame.left, layer->displayFrame.top, layer->displayFrame.right, layer->displayFrame.bottom,
@@ -109,11 +110,11 @@
void
hwcv10_proc_invalidate(const struct hwc_procs* procs)
{
- fprintf(stderr, "%s: procs=%x\n", __func__, procs);
+ fprintf(stderr, "%s: procs=%" PRIxPTR "\n", __func__, (uintptr_t)procs);
}
void
-hwcv10_proc_vsync(const struct hwc_procs* procs, int disp, int64_t timestamp)
+hwcv10_proc_vsync(const struct hwc_procs* /*procs*/, int /*disp*/, int64_t /*timestamp*/)
{
//fprintf(stderr, "%s: procs=%x, disp=%d, timestamp=%.0f\n", __func__, procs, disp, (float)timestamp);
vsync_mutex.lock();
@@ -124,7 +125,7 @@
void
hwcv10_proc_hotplug(const struct hwc_procs* procs, int disp, int connected)
{
- fprintf(stderr, "%s: procs=%x, disp=%d, connected=%d\n", __func__, procs, disp, connected);
+ fprintf(stderr, "%s: procs=%" PRIxPTR ", disp=%d, connected=%d\n", __func__, (uintptr_t)procs, disp, connected);
}
static hwc_procs_t global_procs = {
@@ -218,7 +219,7 @@
}
void
-HwComposerBackend_v10::swap(EGLNativeDisplayType display, EGLSurface surface)
+HwComposerBackend_v10::swap(EGLNativeDisplayType /*display*/, EGLSurface /*surface*/)
{
HWC_PLUGIN_ASSERT_ZERO(!(hwc_list->retireFenceFd == -1));
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.20.tar.bz2/hwcomposer/hwcomposer_backend_v20.cpp
^
|
@@ -73,8 +73,8 @@
HwComposerBackend_v20 *backend;
};
-void hwc2_callback_vsync(HWC2EventListener* listener, int32_t sequenceId,
- hwc2_display_t display, int64_t timestamp)
+void hwc2_callback_vsync(HWC2EventListener* listener, int32_t /*sequenceId*/,
+ hwc2_display_t /*display*/, int64_t /*timestamp*/)
{
static int counter = 0;
++counter;
@@ -100,8 +100,8 @@
sequenceId, display, connected, primaryDisplay);
}
-void hwc2_callback_refresh(HWC2EventListener* listener, int32_t sequenceId,
- hwc2_display_t display)
+void hwc2_callback_refresh(HWC2EventListener* /*listener*/, int32_t /*sequenceId*/,
+ hwc2_display_t /*display*/)
{
}
@@ -434,9 +434,9 @@
return true;
}
-void HwComposerBackend_v20::onHotplugReceived(int32_t sequenceId,
+void HwComposerBackend_v20::onHotplugReceived(int32_t /*sequenceId*/,
hwc2_display_t display, bool connected,
- bool primaryDisplay)
+ bool /*primaryDisplay*/)
{
hwc2_compat_device_on_hotplug(hwc2_device, display, connected);
}
|