lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

Revert^2 "Merge upstream-main into main"

Browse source 
This reverts commit b7a9a2b7d5.

Reason for revert: Crash resolved by Ieb07b5bbc206f07f69e4afba921149f49d6fe8c4
Bug: 349870098

Change-Id: I49848f6e7311c1f44e6c988cb42107ed79da3a6b
This commit is contained in:
Jean-François Thibert 2024-07-03 18:21:13 +00:00 • committed by Gerrit Code Review
parent b7a9a2b7d5
commit fd19358a25
16 changed files with 232 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cros_gralloc/cros_gralloc_helpers.cc
View file

@ -78,6 +78,16 @@ uint32_t cros_gralloc_convert_format(int format)
case HAL_PIXEL_FORMAT_YCBCR_P010:
return DRM_FORMAT_P010;
#endif
case HAL_PIXEL_FORMAT_DEPTH_16:
return DRM_FORMAT_DEPTH16;
case HAL_PIXEL_FORMAT_DEPTH_24:
return DRM_FORMAT_DEPTH24;
case HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8:
return DRM_FORMAT_DEPTH24_STENCIL8;
case HAL_PIXEL_FORMAT_DEPTH_32F:
return DRM_FORMAT_DEPTH32;
case HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8:
return DRM_FORMAT_DEPTH32_STENCIL8;
}
return DRM_FORMAT_NONE;

2
cros_gralloc/gralloc0/tests/gralloctest.c
View file

@ -22,7 +22,7 @@
#include <sync/sync.h>
#include <system/graphics.h>
#define ALIGN(A, B) (((A) + (B)-1) / (B) * (B))
#define ALIGN(A, B) (((A) + (B) - 1) / (B) * (B))
#define ARRAY_SIZE(A) (sizeof(A) / sizeof(*(A)))
#define CHECK(cond) \