minigbm: add support for HAL_PIXEL_FORMAT_RGBA_FP16

[android-x86/external-minigbm.git] / cros_gralloc / cros_gralloc_helpers.cc

diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc
index e662084..4c9c68f 100644 (file)
--- a/cros_gralloc/cros_gralloc_helpers.cc
+++ b/cros_gralloc/cros_gralloc_helpers.cc
@@ -6,8 +6,6 @@
 
 #include "cros_gralloc_helpers.h"
 
-#include <cstdlib>
-#include <cutils/log.h>
 #include <sync/sync.h>
 
 uint32_t cros_gralloc_convert_format(int format)
@@ -28,6 +26,8 @@ uint32_t cros_gralloc_convert_format(int format)
                return DRM_FORMAT_RGB888;
        case HAL_PIXEL_FORMAT_RGBA_8888:
                return DRM_FORMAT_ABGR8888;
+       case HAL_PIXEL_FORMAT_RGBA_FP16:
+               return DRM_FORMAT_XBGR16161616;
        case HAL_PIXEL_FORMAT_RGBX_8888:
                return DRM_FORMAT_XBGR8888;
        case HAL_PIXEL_FORMAT_YCbCr_420_888:
@@ -66,30 +66,19 @@ int32_t cros_gralloc_sync_wait(int32_t acquire_fence)
         */
        int err = sync_wait(acquire_fence, 1000);
        if (err < 0) {
-               cros_gralloc_error("Timed out on sync wait, err = %s", strerror(errno));
+               drv_log("Timed out on sync wait, err = %s\n", strerror(errno));
                err = sync_wait(acquire_fence, -1);
                if (err < 0) {
-                       cros_gralloc_error("sync wait error = %s", strerror(errno));
+                       drv_log("sync wait error = %s\n", strerror(errno));
                        return -errno;
                }
        }
 
        err = close(acquire_fence);
        if (err) {
-               cros_gralloc_error("Unable to close fence fd, err = %s", strerror(errno));
+               drv_log("Unable to close fence fd, err = %s\n", strerror(errno));
                return -errno;
        }
 
        return 0;
 }
-
-void cros_gralloc_log(const char *prefix, const char *file, int line, const char *format, ...)
-{
-       char buf[50];
-       snprintf(buf, sizeof(buf), "[%s:%s(%d)]", prefix, basename(file), line);
-
-       va_list args;
-       va_start(args, format);
-       __android_log_vprint(ANDROID_LOG_ERROR, buf, format, args);
-       va_end(args);
-}