Merge "renderengine: avoid divide-by-zero in shaders" am: 6856100151 (83c30643) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/RenderEngine/ProgramCache.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) {

		// scale [0.0, maxInLumi] to [0.0, maxOutLumi]
		if (maxInLumi <= maxOutLumi) {
		nits *= maxOutLumi / maxInLumi;
		return color * (maxOutLumi / maxInLumi);
		} else {
		// three control points
		const float x0 = 10.0;
		@@ -339,7 +339,7 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) {
		if (nits < x0) {
		// scale [0.0, x0] to [0.0, y0] linearly
		float slope = y0 / x0;
		nits *= slope;
		return color * slope;
		} else if (nits < x1) {
		// scale [x0, x1] to [y0, y1] linearly
		float slope = (y1 - y0) / (x1 - x0);
		@@ -357,7 +357,8 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) {
		}
		}

		return color * (nits / max(1e-6, color.y));
		// color.y is greater than x0 and is thus non-zero
		return color * (nits / color.y);
		}
		)__SHADER__";
		break;
		@@ -388,7 +389,7 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) {
		if (nits <= x0) {
		// scale [0.0, x0] to [0.0, y0] linearly
		const float slope = y0 / x0;
		nits *= slope;
		return color * slope;
		} else if (nits <= x1) {
		// scale [x0, x1] to [y0, y1] using a curve
		float t = (nits - x0) / (x1 - x0);
		@@ -403,7 +404,8 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) {
		nits = (1.0 - t) * (1.0 - t) * y2 + 2.0 * (1.0 - t) * t * c3 + t * t * y3;
		}

		return color * (nits / max(1e-6, color.y));
		// color.y is greater than x0 and is thus non-zero
		return color * (nits / color.y);
		}
		)__SHADER__";
		break;