Revert "Merge Android R"

[android-x86/external-minigbm.git] / virgl_hw.h

diff --git a/virgl_hw.h b/virgl_hw.h
index 94e1d5e..7f4a63f 100644 (file)
--- a/virgl_hw.h
+++ b/virgl_hw.h
@@ -69,7 +69,7 @@ enum virgl_formats {
 
    VIRGL_FORMAT_R8_UNORM                = 64,
    VIRGL_FORMAT_R8G8_UNORM              = 65,
-
+   VIRGL_FORMAT_R8G8B8_UNORM            = 66,
    VIRGL_FORMAT_R8G8B8A8_UNORM          = 67,
 
    VIRGL_FORMAT_R8_SNORM                = 74,
@@ -288,6 +288,20 @@ enum virgl_formats {
 
 #define VIRGL_BIND_PREFER_EMULATED_BGRA  (1 << 21)
 
+#define VIRGL_BIND_LINEAR (1 << 22)
+
+#define VIRGL_BIND_SHARED_SUBFLAGS (0xff << 24)
+
+#define VIRGL_BIND_MINIGBM_CAMERA_WRITE (1 << 24)
+#define VIRGL_BIND_MINIGBM_CAMERA_READ (1 << 25)
+#define VIRGL_BIND_MINIGBM_HW_VIDEO_DECODER (1 << 26)
+#define VIRGL_BIND_MINIGBM_HW_VIDEO_ENCODER (1 << 27)
+#define VIRGL_BIND_MINIGBM_SW_READ_OFTEN (1 << 28)
+#define VIRGL_BIND_MINIGBM_SW_READ_RARELY (1 << 29)
+#define VIRGL_BIND_MINIGBM_SW_WRITE_OFTEN (1 << 30)
+#define VIRGL_BIND_MINIGBM_SW_WRITE_RARELY (1 << 31)
+#define VIRGL_BIND_MINIGBM_PROTECTED (0xf << 28) // Mutually exclusive with SW_ flags
+
 struct virgl_caps_bool_set1 {
         unsigned indep_blend_enable:1;
         unsigned indep_blend_func:1;
@@ -398,6 +412,7 @@ struct virgl_caps_v2 {
         uint32_t max_combined_atomic_counter_buffers;
         uint32_t host_feature_check_version;
         struct virgl_supported_format_mask supported_readback_formats;
+        struct virgl_supported_format_mask scanout;
 };
 
 union virgl_caps {