diff options
| -rw-r--r-- | services/surfaceflinger/RenderEngine/ProgramCache.cpp | 2 | ||||
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.cpp b/services/surfaceflinger/RenderEngine/ProgramCache.cpp index fe992f13b6..2073b05453 100644 --- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp +++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp @@ -220,7 +220,7 @@ void ProgramCache::generateEOTF(Formatter& fs, const Key& needs) { const highp float c2 = (2413.0 / 4096.0) * 32.0; const highp float c3 = (2392.0 / 4096.0) * 32.0; - highp vec3 tmp = pow(color, 1.0 / vec3(m2)); + highp vec3 tmp = pow(clamp(color, 0.0, 1.0), 1.0 / vec3(m2)); tmp = max(tmp - c1, 0.0) / (c2 - c3 * tmp); return pow(tmp, 1.0 / vec3(m1)); } diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index b494bcafec..fdbd969d66 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -945,9 +945,7 @@ VkResult EnumerateDeviceExtensionProperties( memcpy(prop.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME, sizeof(VK_KHR_SWAPCHAIN_EXTENSION_NAME)); - // b/130182551 VK_KHR_SWAPCHAIN_SPEC_VERSION > 68 has structs the - // loader doesn't handle properly. So drop the spec version to 68. - prop.specVersion = 68; + prop.specVersion = VK_KHR_SWAPCHAIN_SPEC_VERSION; } } |