[automerger skipped] Revert "Merge Android R" am: 56e3e9014e -s ours am: 850031de34...

[android-x86/external-minigbm.git] / gbm_helpers.c

diff --git a/gbm_helpers.c b/gbm_helpers.c
index be18a39..0626a6d 100644 (file)
--- a/gbm_helpers.c
+++ b/gbm_helpers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,20 +10,40 @@
 #include "drv.h"
 #include "gbm.h"
 
-uint64_t gbm_convert_flags(uint32_t flags)
+uint64_t gbm_convert_usage(uint32_t usage)
 {
-       uint64_t usage = BO_USE_NONE;
+       uint64_t use_flags = BO_USE_NONE;
 
-       if (flags & GBM_BO_USE_SCANOUT)
-               usage |= BO_USE_SCANOUT;
-       if (flags & GBM_BO_USE_CURSOR)
-               usage |= BO_USE_CURSOR;
-       if (flags & GBM_BO_USE_CURSOR_64X64)
-               usage |= BO_USE_CURSOR_64X64;
-       if (flags & GBM_BO_USE_RENDERING)
-               usage |= BO_USE_RENDERING;
-       if (flags & GBM_BO_USE_LINEAR)
-               usage |= BO_USE_LINEAR;
+       if (usage & GBM_BO_USE_SCANOUT)
+               use_flags |= BO_USE_SCANOUT;
+       if (usage & GBM_BO_USE_CURSOR)
+               use_flags |= BO_USE_CURSOR;
+       if (usage & GBM_BO_USE_CURSOR_64X64)
+               use_flags |= BO_USE_CURSOR_64X64;
+       if (usage & GBM_BO_USE_RENDERING)
+               use_flags |= BO_USE_RENDERING;
+       if (usage & GBM_BO_USE_TEXTURING)
+               use_flags |= BO_USE_TEXTURE;
+       if (usage & GBM_BO_USE_LINEAR)
+               use_flags |= BO_USE_LINEAR;
+       if (usage & GBM_BO_USE_CAMERA_WRITE)
+               use_flags |= BO_USE_CAMERA_WRITE;
+       if (usage & GBM_BO_USE_CAMERA_READ)
+               use_flags |= BO_USE_CAMERA_READ;
+       if (usage & GBM_BO_USE_PROTECTED)
+               use_flags |= BO_USE_PROTECTED;
+       if (usage & GBM_BO_USE_SW_READ_OFTEN)
+               use_flags |= BO_USE_SW_READ_OFTEN;
+       if (usage & GBM_BO_USE_SW_READ_RARELY)
+               use_flags |= BO_USE_SW_READ_RARELY;
+       if (usage & GBM_BO_USE_SW_WRITE_OFTEN)
+               use_flags |= BO_USE_SW_WRITE_OFTEN;
+       if (usage & GBM_BO_USE_SW_WRITE_RARELY)
+               use_flags |= BO_USE_SW_WRITE_RARELY;
+       if (usage & GBM_BO_USE_HW_VIDEO_DECODER)
+               use_flags |= BO_USE_HW_VIDEO_DECODER;
+       if (usage & GBM_BO_USE_HW_VIDEO_ENCODER)
+               use_flags |= BO_USE_HW_VIDEO_ENCODER;
 
-       return usage;
+       return use_flags;
 }