Merge "Use the correct dataspace in shaders.cpp" into tm-dev am: 0a33146773 am: 81d1969876 (d61eee42) · Commits · e / os / android_frameworks_native

libs/shaders/TEST_MAPPING

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			{
			"presubmit": [
			{
			"name": "librenderengine_test"
			},
			{
			"name": "libshaders_test"
			}
			]
			}

libs/shaders/shaders.cpp

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -469,12 +469,17 @@ std::vector<tonemap::ShaderUniform> buildLinearEffectUniforms(
	float currentDisplayLuminanceNits, float maxLuminance, AHardwareBuffer* buffer,		float currentDisplayLuminanceNits, float maxLuminance, AHardwareBuffer* buffer,
	aidl::android::hardware::graphics::composer3::RenderIntent renderIntent) {		aidl::android::hardware::graphics::composer3::RenderIntent renderIntent) {
	std::vector<tonemap::ShaderUniform> uniforms;		std::vector<tonemap::ShaderUniform> uniforms;
	if (linearEffect.inputDataspace == linearEffect.outputDataspace) {
			const ui::Dataspace inputDataspace = linearEffect.fakeInputDataspace == ui::Dataspace::UNKNOWN
			? linearEffect.inputDataspace
			: linearEffect.fakeInputDataspace;

			if (inputDataspace == linearEffect.outputDataspace) {
	uniforms.push_back({.name = "in_rgbToXyz", .value = buildUniformValue<mat4>(mat4())});		uniforms.push_back({.name = "in_rgbToXyz", .value = buildUniformValue<mat4>(mat4())});
	uniforms.push_back(		uniforms.push_back(
	{.name = "in_xyzToRgb", .value = buildUniformValue<mat4>(colorTransform)});		{.name = "in_xyzToRgb", .value = buildUniformValue<mat4>(colorTransform)});
	} else {		} else {
	ColorSpace inputColorSpace = toColorSpace(linearEffect.inputDataspace);		ColorSpace inputColorSpace = toColorSpace(inputDataspace);
	ColorSpace outputColorSpace = toColorSpace(linearEffect.outputDataspace);		ColorSpace outputColorSpace = toColorSpace(linearEffect.outputDataspace);
	uniforms.push_back({.name = "in_rgbToXyz",		uniforms.push_back({.name = "in_rgbToXyz",
	.value = buildUniformValue<mat4>(mat4(inputColorSpace.getRGBtoXYZ()))});		.value = buildUniformValue<mat4>(mat4(inputColorSpace.getRGBtoXYZ()))});

libs/shaders/tests/Android.bp

0 → 100644

+48 −0

Original line number	Original line	Diff line number	Diff line
			// Copyright 2022 The Android Open Source Project
			//
			// Licensed under the Apache License, Version 2.0 (the "License");
			// you may not use this file except in compliance with the License.
			// You may obtain a copy of the License at
			//
			// http://www.apache.org/licenses/LICENSE-2.0
			//
			// Unless required by applicable law or agreed to in writing, software
			// distributed under the License is distributed on an "AS IS" BASIS,
			// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			// See the License for the specific language governing permissions and
			// limitations under the License.

			package {
			// See: http://go/android-license-faq
			// A large-scale-change added 'default_applicable_licenses' to import
			// all of the 'license_kinds' from "frameworks_native_license"
			// to get the below license kinds:
			// SPDX-license-identifier-Apache-2.0
			default_applicable_licenses: ["frameworks_native_license"],
			}

			cc_test {
			name: "libshaders_test",
			test_suites: ["device-tests"],
			srcs: [
			"shaders_test.cpp",
			],
			header_libs: [
			"libtonemap_headers",
			],
			shared_libs: [
			"android.hardware.graphics.common-V3-ndk",
			"android.hardware.graphics.composer3-V1-ndk",
			"android.hardware.graphics.common@1.2",
			"libnativewindow",
			],
			static_libs: [
			"libarect",
			"libgmock",
			"libgtest",
			"libmath",
			"libshaders",
			"libtonemap",
			"libui-types",
			],
			}

libs/shaders/tests/shaders_test.cpp

0 → 100644

+98 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2022 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include "shaders/shaders.h"
			#include <gmock/gmock.h>
			#include <gtest/gtest.h>
			#include <math/mat4.h>
			#include <tonemap/tonemap.h>
			#include <ui/ColorSpace.h>
			#include <cmath>

			namespace android {

			using testing::Contains;
			using testing::HasSubstr;

			struct ShadersTest : public ::testing::Test {};

			namespace {

			MATCHER_P2(UniformEq, name, value, "") {
			return arg.name == name && arg.value == value;
			}

			template <typename T, std::enable_if_t<std::is_trivially_copyable<T>::value, bool> = true>
			std::vector<uint8_t> buildUniformValue(T value) {
			std::vector<uint8_t> result;
			result.resize(sizeof(value));
			std::memcpy(result.data(), &value, sizeof(value));
			return result;
			}

			} // namespace

			TEST_F(ShadersTest, buildLinearEffectUniforms_selectsNoOpGamutMatrices) {
			shaders::LinearEffect effect =
			shaders::LinearEffect{.inputDataspace = ui::Dataspace::V0_SRGB_LINEAR,
			.outputDataspace = ui::Dataspace::V0_SRGB_LINEAR,
			.fakeInputDataspace = ui::Dataspace::UNKNOWN};

			mat4 colorTransform = mat4::scale(vec4(.9, .9, .9, 1.));
			auto uniforms =
			shaders::buildLinearEffectUniforms(effect, colorTransform, 1.f, 1.f, 1.f, nullptr,
			aidl::android::hardware::graphics::composer3::
			RenderIntent::COLORIMETRIC);
			EXPECT_THAT(uniforms, Contains(UniformEq("in_rgbToXyz", buildUniformValue<mat4>(mat4()))));
			EXPECT_THAT(uniforms,
			Contains(UniformEq("in_xyzToRgb", buildUniformValue<mat4>(colorTransform))));
			}

			TEST_F(ShadersTest, buildLinearEffectUniforms_selectsGamutTransformMatrices) {
			shaders::LinearEffect effect =
			shaders::LinearEffect{.inputDataspace = ui::Dataspace::V0_SRGB,
			.outputDataspace = ui::Dataspace::DISPLAY_P3,
			.fakeInputDataspace = ui::Dataspace::UNKNOWN};

			ColorSpace inputColorSpace = ColorSpace::sRGB();
			ColorSpace outputColorSpace = ColorSpace::DisplayP3();
			auto uniforms =
			shaders::buildLinearEffectUniforms(effect, mat4(), 1.f, 1.f, 1.f, nullptr,
			aidl::android::hardware::graphics::composer3::
			RenderIntent::COLORIMETRIC);
			EXPECT_THAT(uniforms,
			Contains(UniformEq("in_rgbToXyz",
			buildUniformValue<mat4>(mat4(inputColorSpace.getRGBtoXYZ())))));
			EXPECT_THAT(uniforms,
			Contains(UniformEq("in_xyzToRgb",
			buildUniformValue<mat4>(mat4(outputColorSpace.getXYZtoRGB())))));
			}

			TEST_F(ShadersTest, buildLinearEffectUniforms_respectsFakeInputDataspace) {
			shaders::LinearEffect effect =
			shaders::LinearEffect{.inputDataspace = ui::Dataspace::V0_SRGB,
			.outputDataspace = ui::Dataspace::DISPLAY_P3,
			.fakeInputDataspace = ui::Dataspace::DISPLAY_P3};

			auto uniforms =
			shaders::buildLinearEffectUniforms(effect, mat4(), 1.f, 1.f, 1.f, nullptr,
			aidl::android::hardware::graphics::composer3::
			RenderIntent::COLORIMETRIC);
			EXPECT_THAT(uniforms, Contains(UniformEq("in_rgbToXyz", buildUniformValue<mat4>(mat4()))));
			EXPECT_THAT(uniforms, Contains(UniformEq("in_xyzToRgb", buildUniformValue<mat4>(mat4()))));
			}

			} // namespace android