sync with OpenBSD -current
This commit is contained in:
parent
abc24a81d1
commit
921461fcd8
53 changed files with 2169 additions and 443 deletions
|
@ -40,7 +40,10 @@
|
|||
|
||||
static const struct util_format_info format_info[] = {
|
||||
/* Indexed */
|
||||
{ DRM_FORMAT_C8, "C8" },
|
||||
{ DRM_FORMAT_C1, "C1", .ncolors = 2 },
|
||||
{ DRM_FORMAT_C2, "C2", .ncolors = 4 },
|
||||
{ DRM_FORMAT_C4, "C4", .ncolors = 16 },
|
||||
{ DRM_FORMAT_C8, "C8", .ncolors = 256 },
|
||||
/* YUV packed */
|
||||
{ DRM_FORMAT_UYVY, "UYVY", MAKE_YUV_INFO(YUV_YCbCr | YUV_CY, 2, 2, 2) },
|
||||
{ DRM_FORMAT_VYUY, "VYUY", MAKE_YUV_INFO(YUV_YCrCb | YUV_CY, 2, 2, 2) },
|
||||
|
@ -51,6 +54,11 @@ static const struct util_format_info format_info[] = {
|
|||
{ DRM_FORMAT_NV21, "NV21", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 2) },
|
||||
{ DRM_FORMAT_NV16, "NV16", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
|
||||
{ DRM_FORMAT_NV61, "NV61", MAKE_YUV_INFO(YUV_YCrCb, 2, 1, 2) },
|
||||
{ DRM_FORMAT_NV24, "NV24", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
|
||||
{ DRM_FORMAT_NV42, "NV42", MAKE_YUV_INFO(YUV_YCrCb, 1, 1, 2) },
|
||||
{ DRM_FORMAT_NV15, "NV15", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 2) },
|
||||
{ DRM_FORMAT_NV20, "NV20", MAKE_YUV_INFO(YUV_YCbCr, 2, 1, 2) },
|
||||
{ DRM_FORMAT_NV30, "NV30", MAKE_YUV_INFO(YUV_YCbCr, 1, 1, 2) },
|
||||
/* YUV planar */
|
||||
{ DRM_FORMAT_YUV420, "YU12", MAKE_YUV_INFO(YUV_YCbCr, 2, 2, 1) },
|
||||
{ DRM_FORMAT_YVU420, "YV12", MAKE_YUV_INFO(YUV_YCrCb, 2, 2, 1) },
|
||||
|
@ -73,6 +81,9 @@ static const struct util_format_info format_info[] = {
|
|||
{ DRM_FORMAT_BGRX5551, "BX15", MAKE_RGB_INFO(5, 1, 5, 6, 5, 11, 0, 0) },
|
||||
{ DRM_FORMAT_RGB565, "RG16", MAKE_RGB_INFO(5, 11, 6, 5, 5, 0, 0, 0) },
|
||||
{ DRM_FORMAT_BGR565, "BG16", MAKE_RGB_INFO(5, 0, 6, 5, 5, 11, 0, 0) },
|
||||
/* Big-endian RGB16 */
|
||||
{ DRM_FORMAT_XRGB1555 | DRM_FORMAT_BIG_ENDIAN, "XR15_BE", MAKE_RGB_INFO(5, 10, 5, 5, 5, 0, 0, 0) },
|
||||
{ DRM_FORMAT_RGB565 | DRM_FORMAT_BIG_ENDIAN, "RG16_BE", MAKE_RGB_INFO(5, 11, 6, 5, 5, 0, 0, 0) },
|
||||
/* RGB24 */
|
||||
{ DRM_FORMAT_BGR888, "BG24", MAKE_RGB_INFO(8, 0, 8, 8, 8, 16, 0, 0) },
|
||||
{ DRM_FORMAT_RGB888, "RG24", MAKE_RGB_INFO(8, 16, 8, 8, 8, 0, 0, 0) },
|
||||
|
|
|
@ -55,6 +55,7 @@ struct util_yuv_info {
|
|||
struct util_format_info {
|
||||
uint32_t format;
|
||||
const char *name;
|
||||
unsigned int ncolors;
|
||||
const struct util_rgb_info rgb;
|
||||
const struct util_yuv_info yuv;
|
||||
};
|
||||
|
|
|
@ -125,6 +125,7 @@ static const char * const modules[] = {
|
|||
"mxsfb-drm",
|
||||
"simpledrm",
|
||||
"imx-lcdif",
|
||||
"vkms",
|
||||
};
|
||||
|
||||
int util_open(const char *device, const char *module)
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -39,7 +39,7 @@ void util_fill_pattern(uint32_t format, enum util_fill_pattern pattern,
|
|||
void *planes[3], unsigned int width,
|
||||
unsigned int height, unsigned int stride);
|
||||
|
||||
void util_smpte_c8_gamma(unsigned size, struct drm_color_lut *lut);
|
||||
void util_smpte_fill_lut(unsigned int ncolors, struct drm_color_lut *lut);
|
||||
|
||||
enum util_fill_pattern util_pattern_enum(const char *name);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue