Merge "Fix VENDOR_MASK constant" into main

This commit is contained in:
John Reck 2024-02-14 23:37:56 +00:00 committed by Android (Google) Code Review
commit 63143aa816
10 changed files with 10 additions and 6 deletions

View file

@ -1 +1,2 @@
f5bdf5724a941dc7e5e7d0ebe9dfe028f7bcc25f f5bdf5724a941dc7e5e7d0ebe9dfe028f7bcc25f
71da13748094aa53237dd6eeac04f0f9add80aa1

View file

@ -42,6 +42,6 @@ enum BufferUsage {
GPU_MIPMAP_COMPLETE = 67108864, GPU_MIPMAP_COMPLETE = 67108864,
HW_IMAGE_ENCODER = 134217728, HW_IMAGE_ENCODER = 134217728,
GPU_DATA_BUFFER = 16777216, GPU_DATA_BUFFER = 16777216,
VENDOR_MASK = -268435456, VENDOR_MASK = 4026531840,
VENDOR_MASK_HI = -281474976710656, VENDOR_MASK_HI = -281474976710656,
} }

View file

@ -1 +1,2 @@
bd2f5e2ab1d5112dfe982f64012e425f544c9d60 bd2f5e2ab1d5112dfe982f64012e425f544c9d60
4279f88ef38c8fdeea6797410b464ae29df34e72

View file

@ -58,6 +58,6 @@ enum BufferUsage {
GPU_MIPMAP_COMPLETE = 67108864, GPU_MIPMAP_COMPLETE = 67108864,
HW_IMAGE_ENCODER = 134217728, HW_IMAGE_ENCODER = 134217728,
GPU_DATA_BUFFER = 16777216, GPU_DATA_BUFFER = 16777216,
VENDOR_MASK = -268435456, VENDOR_MASK = 4026531840,
VENDOR_MASK_HI = -281474976710656, VENDOR_MASK_HI = -281474976710656,
} }

View file

@ -1 +1,2 @@
e7e8b0bd7cd27ab4f1998700ef19ebc82e022d87 e7e8b0bd7cd27ab4f1998700ef19ebc82e022d87
37aa15ac89ae27f3f89099d79609f5aaa1717de5

View file

@ -60,6 +60,6 @@ enum BufferUsage {
GPU_MIPMAP_COMPLETE = 67108864, GPU_MIPMAP_COMPLETE = 67108864,
HW_IMAGE_ENCODER = 134217728, HW_IMAGE_ENCODER = 134217728,
FRONT_BUFFER = 4294967296, FRONT_BUFFER = 4294967296,
VENDOR_MASK = -268435456, VENDOR_MASK = 4026531840,
VENDOR_MASK_HI = -281474976710656, VENDOR_MASK_HI = -281474976710656,
} }

View file

@ -1 +1,2 @@
9bcf4b83485ce912dc39108201504f77b8c96cef 9bcf4b83485ce912dc39108201504f77b8c96cef
adb71c34ba271f87c6431845b310777c1e611ebf

View file

@ -60,6 +60,6 @@ enum BufferUsage {
GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */, GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */,
HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */, HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */,
FRONT_BUFFER = (1L << 32) /* 4294967296 */, FRONT_BUFFER = (1L << 32) /* 4294967296 */,
VENDOR_MASK = (0xf << 28) /* -268435456 */, VENDOR_MASK = (0xfL << 28) /* 4026531840 */,
VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */, VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */,
} }

View file

@ -60,6 +60,6 @@ enum BufferUsage {
GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */, GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */,
HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */, HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */,
FRONT_BUFFER = (1L << 32) /* 4294967296 */, FRONT_BUFFER = (1L << 32) /* 4294967296 */,
VENDOR_MASK = (0xf << 28) /* -268435456 */, VENDOR_MASK = (0xfL << 28) /* 4026531840 */,
VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */, VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */,
} }

View file

@ -150,7 +150,7 @@ enum BufferUsage {
FRONT_BUFFER = 1L << 32, FRONT_BUFFER = 1L << 32,
/** bits 28-31 are reserved for vendor extensions */ /** bits 28-31 are reserved for vendor extensions */
VENDOR_MASK = 0xf << 28, VENDOR_MASK = 0xfL << 28,
/** bits 33-47 must be zero and are reserved for future versions */ /** bits 33-47 must be zero and are reserved for future versions */
/** bits 48-63 are reserved for vendor extensions */ /** bits 48-63 are reserved for vendor extensions */