Merge "Increase color comparison threshold for blurred case" into sc-dev (272e1621) · Commits · e / os / android_frameworks_native

libs/renderengine/tests/RenderEngineTest.cpp

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -969,7 +969,7 @@ void RenderEngineTest::fillBufferAndBlurBackground() {
	if (mRE->supportsBackgroundBlur()) {		if (mRE->supportsBackgroundBlur()) {
	// blurred color (downsampling should result in the center color being close to 128)		// blurred color (downsampling should result in the center color being close to 128)
	expectBufferColor(Rect(center - 1, center - 5, center + 1, center + 5), 128, 128, 0, 255,		expectBufferColor(Rect(center - 1, center - 5, center + 1, center + 5), 128, 128, 0, 255,
	10 /* tolerance */);		50 /* tolerance */);
	}		}
	}		}

	@@ -1438,8 +1438,7 @@ TEST_P(RenderEngineTest, drawLayers_fillBufferColorTransformZeroLayerAlpha_color
	fillBufferColorTransformZeroLayerAlpha<ColorSourceVariant>();		fillBufferColorTransformZeroLayerAlpha<ColorSourceVariant>();
	}		}

	// TODO(b/186010146): reenable once swiftshader is happy with this test		TEST_P(RenderEngineTest, drawLayers_fillBufferAndBlurBackground_colorSource) {
	TEST_P(RenderEngineTest, DISABLED_drawLayers_fillBufferAndBlurBackground_colorSource) {
	initializeRenderEngine();		initializeRenderEngine();
	fillBufferAndBlurBackground<ColorSourceVariant>();		fillBufferAndBlurBackground<ColorSourceVariant>();
	}		}
	@@ -1519,8 +1518,7 @@ TEST_P(RenderEngineTest, drawLayers_fillBufferColorTransformZeroLayerAlpha_opaqu
	fillBufferColorTransformZeroLayerAlpha<BufferSourceVariant<ForceOpaqueBufferVariant>>();		fillBufferColorTransformZeroLayerAlpha<BufferSourceVariant<ForceOpaqueBufferVariant>>();
	}		}

	// TODO(b/186010146): reenable once swiftshader is happy with this test		TEST_P(RenderEngineTest, drawLayers_fillBufferAndBlurBackground_opaqueBufferSource) {
	TEST_P(RenderEngineTest, DISABLED_drawLayers_fillBufferAndBlurBackground_opaqueBufferSource) {
	initializeRenderEngine();		initializeRenderEngine();
	fillBufferAndBlurBackground<BufferSourceVariant<ForceOpaqueBufferVariant>>();		fillBufferAndBlurBackground<BufferSourceVariant<ForceOpaqueBufferVariant>>();
	}		}
	@@ -1600,8 +1598,7 @@ TEST_P(RenderEngineTest, drawLayers_fillBufferColorTransformZeroLayerAlpha_buffe
	fillBufferColorTransformZeroLayerAlpha<BufferSourceVariant<RelaxOpaqueBufferVariant>>();		fillBufferColorTransformZeroLayerAlpha<BufferSourceVariant<RelaxOpaqueBufferVariant>>();
	}		}

	// TODO(b/186010146): reenable once swiftshader is happy with this test		TEST_P(RenderEngineTest, drawLayers_fillBufferAndBlurBackground_bufferSource) {
	TEST_P(RenderEngineTest, DISABLED_drawLayers_fillBufferAndBlurBackground_bufferSource) {
	initializeRenderEngine();		initializeRenderEngine();
	fillBufferAndBlurBackground<BufferSourceVariant<RelaxOpaqueBufferVariant>>();		fillBufferAndBlurBackground<BufferSourceVariant<RelaxOpaqueBufferVariant>>();
	}		}