Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b906c8 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."

parents 566c24cf 0e72cd58

services/surfaceflinger/RenderEngine/ProgramCache.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 c2 = (2413.0 / 4096.0) * 32.0;

                    const highp float c3 = (2392.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);

                    tmp = max(tmp - c1, 0.0) / (c2 - c3 * tmp);

                    return pow(tmp, 1.0 / vec3(m1));

                    return pow(tmp, 1.0 / vec3(m1));

                }

                }

vulkan/libvulkan/driver.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -945,9 +945,7 @@ VkResult EnumerateDeviceExtensionProperties( 




            memcpy(prop.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME,

            memcpy(prop.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME,

                   sizeof(VK_KHR_SWAPCHAIN_EXTENSION_NAME));

                   sizeof(VK_KHR_SWAPCHAIN_EXTENSION_NAME));

            // b/130182551 VK_KHR_SWAPCHAIN_SPEC_VERSION > 68 has structs the

            prop.specVersion = VK_KHR_SWAPCHAIN_SPEC_VERSION;

            // loader doesn't handle properly. So drop the spec version to 68.

            prop.specVersion = 68;

        }

        }

    }

    }