diff options
Diffstat (limited to 'vulkan')
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 2 | ||||
| -rw-r--r-- | vulkan/libvulkan/swapchain.cpp | 28 | ||||
| -rw-r--r-- | vulkan/vkjson/Android.bp | 2 |
3 files changed, 15 insertions, 17 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index fdbd969d66..a607a5d098 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -984,7 +984,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, uint32_t icd_api_version; PFN_vkEnumerateInstanceVersion pfn_enumerate_instance_version = reinterpret_cast<PFN_vkEnumerateInstanceVersion>( - Hal::Device().GetInstanceProcAddr(NULL, + Hal::Device().GetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion")); if (!pfn_enumerate_instance_version) { icd_api_version = VK_API_VERSION_1_0; diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 3db8a3962e..86013737c6 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -335,15 +335,15 @@ uint32_t get_num_ready_timings(Swapchain& swapchain) { swapchain.surface.window.get(), ti.native_frame_id_, &desired_present_time, &render_complete_time, &composition_latch_time, - NULL, //&first_composition_start_time, - NULL, //&last_composition_start_time, - NULL, //&composition_finish_time, + nullptr, //&first_composition_start_time, + nullptr, //&last_composition_start_time, + nullptr, //&composition_finish_time, // TODO(ianelliott): Maybe ask if this one is // supported, at startup time (since it may not be // supported): &actual_present_time, - NULL, //&dequeue_ready_time, - NULL /*&reads_done_time*/); + nullptr, //&dequeue_ready_time, + nullptr /*&reads_done_time*/); if (ret != android::NO_ERROR) { continue; @@ -569,21 +569,17 @@ VkResult GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice /*pdev*/, switch (native_format) { case HAL_PIXEL_FORMAT_RGBA_8888: case HAL_PIXEL_FORMAT_RGB_565: + case HAL_PIXEL_FORMAT_RGBA_FP16: format_supported = true; break; default: break; } - // USAGE_CPU_READ_MASK 0xFUL - // USAGE_CPU_WRITE_MASK (0xFUL << 4) - // The currently used bits are as below: - // USAGE_CPU_READ_RARELY = 2UL - // USAGE_CPU_READ_OFTEN = 3UL - // USAGE_CPU_WRITE_RARELY = (2UL << 4) - // USAGE_CPU_WRITE_OFTEN = (3UL << 4) - *supported = static_cast<VkBool32>(format_supported || - (surface->consumer_usage & 0xFFUL) == 0); + *supported = static_cast<VkBool32>( + format_supported || (surface->consumer_usage & + (AHARDWAREBUFFER_USAGE_CPU_READ_MASK | + AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK)) == 0); return VK_SUCCESS; } @@ -700,6 +696,10 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT}, {VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT}, + {VK_FORMAT_R16G16B16A16_SFLOAT, + VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT}, + {VK_FORMAT_R16G16B16A16_SFLOAT, + VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT}, }; const uint32_t kNumWideColorFormats = sizeof(kWideColorFormats) / sizeof(kWideColorFormats[0]); diff --git a/vulkan/vkjson/Android.bp b/vulkan/vkjson/Android.bp index 93620f4157..78d6694270 100644 --- a/vulkan/vkjson/Android.bp +++ b/vulkan/vkjson/Android.bp @@ -10,7 +10,6 @@ cc_library_static { "-Wimplicit-fallthrough", ], cppflags: [ - "-std=c++11", "-Wno-sign-compare", ], export_include_dirs: [ @@ -37,7 +36,6 @@ cc_library_static { "-Wimplicit-fallthrough", ], cppflags: [ - "-std=c++11", "-Wno-sign-compare", ], export_include_dirs: [ |