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

Commit 5b007cc9 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Use highp to avoid float overflow in expression" am: a910a7f0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2146965



Change-Id: Ie5c0e509af14521a7e4a8fa0afc829353b60541a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d93e16b7 a910a7f0

media/libstagefright/renderfright/gl/ProgramCache.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -374,7 +374,11 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) { 
                                    return color * slope;

                                    return color * slope;

                                } else if (nits < x1) {

                                } else if (nits < x1) {

                                    // scale [x0, x1] to [y0, y1] linearly

                                    // scale [x0, x1] to [y0, y1] linearly

                                    float slope = (y1 - y0) / (x1 - x0);

                                    // Use highp since some compilers may do this

                                    // operation as reciprocal multiplication with

                                    // re-association that could exceed the range

                                    // of mediump float.

                                    highp float slope = (y1 - y0) / (x1 - x0);

                                    nits = y0 + (nits - x0) * slope;

                                    nits = y0 + (nits - x0) * slope;

                                } else if (nits < x2) {

                                } else if (nits < x2) {

                                    // scale [x1, x2] to [y1, y2] using Hermite interp

                                    // scale [x1, x2] to [y1, y2] using Hermite interp