diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-03 00:41:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-03 00:41:00 +0000 |
| commit | d6c59a03524da48cbfa51b7f92425d15ffaaf96f (patch) | |
| tree | 29b0dc9a5d6790b8fcb850b0f19d7386ef1fd708 | |
| parent | 7d0b8dd78b28933a5d41b68066835ceff44779ac (diff) | |
| parent | 42e6423fac658add6ac9faf9428eb8f2f6190ab8 (diff) | |
| download | mesa3d-simpleperf-release.tar.gz | |
Merge "Snap for 11400057 from 1aa4951402e401d9a4e15d532b3dafb52f0da841 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -rw-r--r-- | include/c99_math.h | 8 | ||||
| -rw-r--r-- | src/intel/vulkan/vk_format_info.h | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/c99_math.h b/include/c99_math.h index e906c26aa54..ac382ba36e7 100644 --- a/include/c99_math.h +++ b/include/c99_math.h @@ -116,14 +116,6 @@ exp2(double d) #endif /* C99 */ -/* - * signbit() is a macro on Linux. Not available on Windows. - */ -#ifndef signbit -#define signbit(x) ((x) < 0.0f) -#endif - - #ifndef M_PI #define M_PI (3.14159265358979323846) #endif diff --git a/src/intel/vulkan/vk_format_info.h b/src/intel/vulkan/vk_format_info.h index 4e72c244742..0c4b1efeb5e 100644 --- a/src/intel/vulkan/vk_format_info.h +++ b/src/intel/vulkan/vk_format_info.h @@ -32,11 +32,6 @@ /* See i915_private_android_types.h in minigbm. */ #define HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL 0x100 -enum { - /* Usage bit equal to GRALLOC_USAGE_HW_CAMERA_MASK */ - AHARDWAREBUFFER_USAGE_CAMERA_MASK = 0x00060000U, -}; - static inline VkFormat vk_format_from_android(unsigned android_format, unsigned android_usage) { |