1793e7bb46
This reverts commit c6f7a4ffa9.
Reason for revert: Causing differences in Gold, stemming from the fact that this changes the recommended SkImageInfo for 16 bits-per-component PNG from N32 to F16.
- an F16 bitmap already png-encodes to a 16 bits-per-component PNG, but it does not encode a linear colorspace (possibly a bug?). when we decode this PNG using getInfo(), it fails because it has an F16 color type and non-linear colorspace. (In the encode-srgb-png gm, this results in blank results for F16.) We could correct this on the encoder side, but it seems possible that a 16 bits-per-component PNG could be encoded with a different color space. In that case, we'd want SkCodec to recommend F16/SRGBLinear, but I think we'd want the SkCodec to store the encoded SkColorSpace so that we can Xform between the two. Currently SkCodec only stores one color space, so that will require a refactor.
- When decoding 16-bits-per-component PNGs, we are now decoding them to F16. This shows differences in Gold. The srgb/gpu results now look more like F16. I think this is fine.
Original change's description:
> Hide SkEncodedInfo
>
> Bug: skia:7353
> Bug: skia:6839
>
> This contains information that is not necessary for clients to know. The
> Color enum tells the number of components in the input, but this is only
> interesting internally (to the SkSwizzler).
>
> Similarly, the Alpha enum differs from SkAlphaType in that it has
> kBinary instead of kPremul. This is useful information only internally
> for determining whether the SkColorSpaceXform needs to premultiply.
>
> The bitsPerComponent is potentially useful for a client; Android (in
> SkAndroidCodec) uses it to determine the SkColorType. Rather than
> exposing bitsPerComponent, use it to make the same decision that Android
> would have made - 16 bits per component means to set the info to F16. Add
> a test that computeOutputColorType behaves as expected.
>
> Switch conversionSupported to use an SkColorType, which is enough info.
>
> Replace the SkEncodedInfo::Alpha field on SkCodec::FrameInfo with an
> SkAlphaType.
>
> SkCodec still needs an SkEncodedInfo, so move its header (which is
> already not SK_API) to include/private.
>
> Change-Id: Ie2cf11339bf999ebfd4390c0f448f7edd6feabda
> Reviewed-on: https://skia-review.googlesource.com/79260
> Reviewed-by: Mike Reed <reed@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Leon Scroggins <scroggo@google.com>
TBR=mtklein@chromium.org,scroggo@google.com,reed@google.com
Change-Id: I0c5dd1461e1b70d1e55349a8e7ee6b029c3f556e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7353, skia:6839
Reviewed-on: https://skia-review.googlesource.com/80660
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
338 lines
11 KiB
Plaintext
338 lines
11 KiB
Plaintext
# Copyright 2016 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# Things are easiest for everyone if these source paths are absolute.
|
|
_tests = get_path_info("../tests", "abspath")
|
|
|
|
tests_sources = [
|
|
"$_tests/AAClipTest.cpp",
|
|
"$_tests/AnnotationTest.cpp",
|
|
"$_tests/ApplyGammaTest.cpp",
|
|
"$_tests/ArenaAllocTest.cpp",
|
|
"$_tests/AsADashTest.cpp",
|
|
"$_tests/BadIcoTest.cpp",
|
|
"$_tests/BitmapCopyTest.cpp",
|
|
"$_tests/BitmapGetColorTest.cpp",
|
|
"$_tests/BitmapTest.cpp",
|
|
"$_tests/BitSetTest.cpp",
|
|
"$_tests/BlendTest.cpp",
|
|
"$_tests/BlitMaskClip.cpp",
|
|
"$_tests/BlurTest.cpp",
|
|
"$_tests/CachedDataTest.cpp",
|
|
"$_tests/CachedDecodingPixelRefTest.cpp",
|
|
"$_tests/CanvasStateHelpers.cpp",
|
|
"$_tests/CanvasStateTest.cpp",
|
|
"$_tests/CanvasTest.cpp",
|
|
"$_tests/ChecksumTest.cpp",
|
|
"$_tests/ClampRangeTest.cpp",
|
|
"$_tests/ClearTest.cpp",
|
|
"$_tests/ClipBoundsTest.cpp",
|
|
"$_tests/ClipCubicTest.cpp",
|
|
"$_tests/ClipperTest.cpp",
|
|
"$_tests/ClipStackTest.cpp",
|
|
"$_tests/CodecAnimTest.cpp",
|
|
"$_tests/CodecExactReadTest.cpp",
|
|
"$_tests/CodecPartialTest.cpp",
|
|
"$_tests/CodecTest.cpp",
|
|
"$_tests/ColorFilterTest.cpp",
|
|
"$_tests/ColorMatrixTest.cpp",
|
|
"$_tests/ColorPrivTest.cpp",
|
|
"$_tests/ColorSpaceTest.cpp",
|
|
"$_tests/ColorSpaceXformTest.cpp",
|
|
"$_tests/ColorTest.cpp",
|
|
"$_tests/CopySurfaceTest.cpp",
|
|
"$_tests/CPlusPlusEleven.cpp",
|
|
"$_tests/CTest.cpp",
|
|
"$_tests/DashPathEffectTest.cpp",
|
|
"$_tests/DataRefTest.cpp",
|
|
"$_tests/DefaultPathRendererTest.cpp",
|
|
"$_tests/DeferredDisplayListTest.cpp",
|
|
"$_tests/DequeTest.cpp",
|
|
"$_tests/DetermineDomainModeTest.cpp",
|
|
"$_tests/DeviceLooperTest.cpp",
|
|
"$_tests/DeviceTest.cpp",
|
|
"$_tests/DFPathRendererTest.cpp",
|
|
"$_tests/DiscardableMemoryPoolTest.cpp",
|
|
"$_tests/DiscardableMemoryTest.cpp",
|
|
"$_tests/DrawBitmapRectTest.cpp",
|
|
"$_tests/DrawFilterTest.cpp",
|
|
"$_tests/DrawPathTest.cpp",
|
|
"$_tests/DrawTextTest.cpp",
|
|
"$_tests/DynamicHashTest.cpp",
|
|
"$_tests/EGLImageTest.cpp",
|
|
"$_tests/EmptyPathTest.cpp",
|
|
"$_tests/EncodeTest.cpp",
|
|
"$_tests/ExifTest.cpp",
|
|
"$_tests/F16StagesTest.cpp",
|
|
"$_tests/FillPathTest.cpp",
|
|
"$_tests/FitsInTest.cpp",
|
|
"$_tests/FlattenableCustomFactory.cpp",
|
|
"$_tests/FlattenableFactoryToName.cpp",
|
|
"$_tests/FlattenDrawableTest.cpp",
|
|
"$_tests/Float16Test.cpp",
|
|
"$_tests/FloatingPointTextureTest.cpp",
|
|
"$_tests/FontHostStreamTest.cpp",
|
|
"$_tests/FontHostTest.cpp",
|
|
"$_tests/FontMgrAndroidParserTest.cpp",
|
|
"$_tests/FontMgrTest.cpp",
|
|
"$_tests/FontNamesTest.cpp",
|
|
"$_tests/FontObjTest.cpp",
|
|
"$_tests/FrontBufferedStreamTest.cpp",
|
|
"$_tests/GeometryTest.cpp",
|
|
"$_tests/GifTest.cpp",
|
|
"$_tests/GLProgramsTest.cpp",
|
|
"$_tests/GpuDrawPathTest.cpp",
|
|
"$_tests/GpuLayerCacheTest.cpp",
|
|
"$_tests/GpuRectanizerTest.cpp",
|
|
"$_tests/GpuSampleLocationsTest.cpp",
|
|
"$_tests/GradientTest.cpp",
|
|
"$_tests/GrAllocatorTest.cpp",
|
|
"$_tests/GrCCPRTest.cpp",
|
|
"$_tests/GrContextAbandonTest.cpp",
|
|
"$_tests/GrContextFactoryTest.cpp",
|
|
"$_tests/GrGLExtensionsTest.cpp",
|
|
"$_tests/GrMemoryPoolTest.cpp",
|
|
"$_tests/GrMeshTest.cpp",
|
|
"$_tests/GrMipMappedTest.cpp",
|
|
"$_tests/GrPipelineDynamicStateTest.cpp",
|
|
"$_tests/GrPorterDuffTest.cpp",
|
|
"$_tests/GrShapeTest.cpp",
|
|
"$_tests/GrSKSLPrettyPrintTest.cpp",
|
|
"$_tests/GrSurfaceTest.cpp",
|
|
"$_tests/GrTextureMipMapInvalidationTest.cpp",
|
|
"$_tests/GrTRecorderTest.cpp",
|
|
"$_tests/HashTest.cpp",
|
|
"$_tests/HighContrastFilterTest.cpp",
|
|
"$_tests/HSVRoundTripTest.cpp",
|
|
"$_tests/image-bitmap.cpp",
|
|
"$_tests/ICCTest.cpp",
|
|
"$_tests/ImageCacheTest.cpp",
|
|
"$_tests/ImageFilterCacheTest.cpp",
|
|
"$_tests/ImageFilterTest.cpp",
|
|
"$_tests/ImageFrom565Bitmap.cpp",
|
|
"$_tests/ImageGeneratorTest.cpp",
|
|
"$_tests/ImageIsOpaqueTest.cpp",
|
|
"$_tests/ImageNewShaderTest.cpp",
|
|
"$_tests/ImageTest.cpp",
|
|
"$_tests/IndexedPngOverflowTest.cpp",
|
|
"$_tests/InfRectTest.cpp",
|
|
"$_tests/InsetConvexPolyTest.cpp",
|
|
"$_tests/InterpolatorTest.cpp",
|
|
"$_tests/IntTextureTest.cpp",
|
|
"$_tests/InvalidIndexedPngTest.cpp",
|
|
"$_tests/IsClosedSingleContourTest.cpp",
|
|
"$_tests/LayerDrawLooperTest.cpp",
|
|
"$_tests/LayerRasterizerTest.cpp",
|
|
"$_tests/LazyProxyTest.cpp",
|
|
"$_tests/LListTest.cpp",
|
|
"$_tests/LRUCacheTest.cpp",
|
|
"$_tests/MallocPixelRefTest.cpp",
|
|
"$_tests/MaskCacheTest.cpp",
|
|
"$_tests/MathTest.cpp",
|
|
"$_tests/Matrix44Test.cpp",
|
|
"$_tests/MatrixClipCollapseTest.cpp",
|
|
"$_tests/MatrixTest.cpp",
|
|
"$_tests/MD5Test.cpp",
|
|
"$_tests/MemoryTest.cpp",
|
|
"$_tests/MemsetTest.cpp",
|
|
"$_tests/MessageBusTest.cpp",
|
|
"$_tests/MetaDataTest.cpp",
|
|
"$_tests/MipMapTest.cpp",
|
|
"$_tests/OnceTest.cpp",
|
|
"$_tests/OSPathTest.cpp",
|
|
"$_tests/OverAlignedTest.cpp",
|
|
"$_tests/PackBitsTest.cpp",
|
|
"$_tests/PackedConfigsTextureTest.cpp",
|
|
"$_tests/PaintBreakTextTest.cpp",
|
|
"$_tests/PaintImageFilterTest.cpp",
|
|
"$_tests/PaintTest.cpp",
|
|
"$_tests/ParametricStageTest.cpp",
|
|
"$_tests/ParsePathTest.cpp",
|
|
"$_tests/PathCoverageTest.cpp",
|
|
"$_tests/PathMeasureTest.cpp",
|
|
"$_tests/PathTest.cpp",
|
|
"$_tests/PDFDeflateWStreamTest.cpp",
|
|
"$_tests/PDFDocumentTest.cpp",
|
|
"$_tests/PDFGlyphsToUnicodeTest.cpp",
|
|
"$_tests/PDFJpegEmbedTest.cpp",
|
|
"$_tests/PDFMetadataAttributeTest.cpp",
|
|
"$_tests/PDFOpaqueSrcModeToSrcOverTest.cpp",
|
|
"$_tests/PDFPrimitivesTest.cpp",
|
|
"$_tests/OnFlushCallbackTest.cpp",
|
|
"$_tests/PathRendererCacheTests.cpp",
|
|
"$_tests/PictureBBHTest.cpp",
|
|
"$_tests/PictureShaderTest.cpp",
|
|
"$_tests/PictureTest.cpp",
|
|
"$_tests/PinnedImageTest.cpp",
|
|
"$_tests/PipeTest.cpp",
|
|
"$_tests/PixelRefTest.cpp",
|
|
"$_tests/Point3Test.cpp",
|
|
"$_tests/PointTest.cpp",
|
|
"$_tests/PremulAlphaRoundTripTest.cpp",
|
|
"$_tests/PrimitiveProcessorTest.cpp",
|
|
"$_tests/ProcessorTest.cpp",
|
|
"$_tests/ProxyConversionTest.cpp",
|
|
"$_tests/ProxyRefTest.cpp",
|
|
"$_tests/ProxyTest.cpp",
|
|
"$_tests/QuickRejectTest.cpp",
|
|
"$_tests/RandomTest.cpp",
|
|
"$_tests/Reader32Test.cpp",
|
|
"$_tests/ReadPixelsTest.cpp",
|
|
"$_tests/ReadWriteAlphaTest.cpp",
|
|
"$_tests/RecordDrawTest.cpp",
|
|
"$_tests/RecorderTest.cpp",
|
|
"$_tests/RecordingXfermodeTest.cpp",
|
|
"$_tests/RecordOptsTest.cpp",
|
|
"$_tests/RecordPatternTest.cpp",
|
|
"$_tests/RecordTest.cpp",
|
|
"$_tests/RectangleTextureTest.cpp",
|
|
"$_tests/RectTest.cpp",
|
|
"$_tests/RefCntTest.cpp",
|
|
"$_tests/RefDictTest.cpp",
|
|
"$_tests/RegionTest.cpp",
|
|
"$_tests/RenderTargetContextTest.cpp",
|
|
"$_tests/ResourceAllocatorTest.cpp",
|
|
"$_tests/ResourceCacheTest.cpp",
|
|
"$_tests/RoundRectTest.cpp",
|
|
"$_tests/RRectInPathTest.cpp",
|
|
"$_tests/RTreeTest.cpp",
|
|
"$_tests/SafeMathTest.cpp",
|
|
"$_tests/ScalarTest.cpp",
|
|
"$_tests/ScaleToSidesTest.cpp",
|
|
"$_tests/SerializationTest.cpp",
|
|
"$_tests/ShaderOpacityTest.cpp",
|
|
"$_tests/ShaderTest.cpp",
|
|
"$_tests/ShadowTest.cpp",
|
|
"$_tests/SizeTest.cpp",
|
|
"$_tests/Sk4x4fTest.cpp",
|
|
"$_tests/SkBase64Test.cpp",
|
|
"$_tests/skbug5221.cpp",
|
|
"$_tests/skbug6389.cpp",
|
|
"$_tests/skbug6653.cpp",
|
|
"$_tests/SkColor4fTest.cpp",
|
|
"$_tests/SkDOMTest.cpp",
|
|
"$_tests/SkFixed15Test.cpp",
|
|
"$_tests/SkGaussFilterTest.cpp",
|
|
"$_tests/SkImageTest.cpp",
|
|
"$_tests/SkLiteDLTest.cpp",
|
|
"$_tests/SkNxTest.cpp",
|
|
"$_tests/SkPEGTest.cpp",
|
|
"$_tests/SkRasterPipelineTest.cpp",
|
|
"$_tests/SkResourceCacheTest.cpp",
|
|
"$_tests/SkSharedMutexTest.cpp",
|
|
"$_tests/SkSLErrorTest.cpp",
|
|
"$_tests/SkSLFPTest.cpp",
|
|
"$_tests/SkSLGLSLTest.cpp",
|
|
"$_tests/SkSLMemoryLayoutTest.cpp",
|
|
"$_tests/SkSLSPIRVTest.cpp",
|
|
"$_tests/SortTest.cpp",
|
|
"$_tests/SpecialImageTest.cpp",
|
|
"$_tests/SpecialSurfaceTest.cpp",
|
|
"$_tests/SrcOverTest.cpp",
|
|
"$_tests/SRGBMipMapTest.cpp",
|
|
"$_tests/SRGBReadWritePixelsTest.cpp",
|
|
"$_tests/SRGBTest.cpp",
|
|
"$_tests/StreamBufferTest.cpp",
|
|
"$_tests/StreamTest.cpp",
|
|
"$_tests/StringTest.cpp",
|
|
"$_tests/StrokerTest.cpp",
|
|
"$_tests/StrokeTest.cpp",
|
|
"$_tests/SubsetPath.cpp",
|
|
"$_tests/SurfaceSemaphoreTest.cpp",
|
|
"$_tests/SurfaceTest.cpp",
|
|
"$_tests/SVGDeviceTest.cpp",
|
|
"$_tests/SwizzlerTest.cpp",
|
|
"$_tests/TArrayTest.cpp",
|
|
"$_tests/TDPQueueTest.cpp",
|
|
"$_tests/TableColorFilterTest.cpp",
|
|
"$_tests/TemplatesTest.cpp",
|
|
"$_tests/TessellatingPathRendererTests.cpp",
|
|
"$_tests/Test.cpp",
|
|
"$_tests/TestConfigParsing.cpp",
|
|
"$_tests/TestTest.cpp",
|
|
"$_tests/TestUtils.h",
|
|
"$_tests/TestUtils.cpp",
|
|
"$_tests/TextBlobCacheTest.cpp",
|
|
"$_tests/TextBlobTest.cpp",
|
|
"$_tests/TextureProxyTest.cpp",
|
|
"$_tests/Time.cpp",
|
|
"$_tests/TLSTest.cpp",
|
|
"$_tests/TopoSortTest.cpp",
|
|
"$_tests/ToSRGBColorFilter.cpp",
|
|
"$_tests/TraceMemoryDumpTest.cpp",
|
|
"$_tests/TracingTest.cpp",
|
|
"$_tests/TransferPixelsTest.cpp",
|
|
"$_tests/TypefaceTest.cpp",
|
|
"$_tests/UnicodeTest.cpp",
|
|
"$_tests/UtilsTest.cpp",
|
|
"$_tests/VerticesTest.cpp",
|
|
"$_tests/VkClearTests.cpp",
|
|
"$_tests/VkHeapTests.cpp",
|
|
"$_tests/VkUploadPixelsTests.cpp",
|
|
"$_tests/VkWrapTests.cpp",
|
|
"$_tests/WindowRectanglesTest.cpp",
|
|
"$_tests/WritePixelsTest.cpp",
|
|
"$_tests/Writer32Test.cpp",
|
|
"$_tests/YUVCacheTest.cpp",
|
|
"$_tests/YUVTest.cpp",
|
|
]
|
|
|
|
pathops_tests_sources = [
|
|
"$_tests/PathOpsAngleIdeas.cpp",
|
|
"$_tests/PathOpsAngleTest.cpp",
|
|
"$_tests/PathOpsBattles.cpp",
|
|
"$_tests/PathOpsBoundsTest.cpp",
|
|
"$_tests/PathOpsBuilderConicTest.cpp",
|
|
"$_tests/PathOpsBuilderTest.cpp",
|
|
"$_tests/PathOpsBuildUseTest.cpp",
|
|
"$_tests/PathOpsChalkboardTest.cpp",
|
|
"$_tests/PathOpsConicIntersectionTest.cpp",
|
|
"$_tests/PathOpsConicLineIntersectionTest.cpp",
|
|
"$_tests/PathOpsConicQuadIntersectionTest.cpp",
|
|
"$_tests/PathOpsCubicConicIntersectionTest.cpp",
|
|
"$_tests/PathOpsCubicIntersectionTest.cpp",
|
|
"$_tests/PathOpsCubicIntersectionTestData.cpp",
|
|
"$_tests/PathOpsCubicLineIntersectionIdeas.cpp",
|
|
"$_tests/PathOpsCubicLineIntersectionTest.cpp",
|
|
"$_tests/PathOpsCubicQuadIntersectionTest.cpp",
|
|
"$_tests/PathOpsCubicReduceOrderTest.cpp",
|
|
"$_tests/PathOpsDCubicTest.cpp",
|
|
"$_tests/PathOpsDebug.cpp",
|
|
"$_tests/PathOpsDLineTest.cpp",
|
|
"$_tests/PathOpsDPointTest.cpp",
|
|
"$_tests/PathOpsDRectTest.cpp",
|
|
"$_tests/PathOpsDVectorTest.cpp",
|
|
"$_tests/PathOpsExtendedTest.cpp",
|
|
"$_tests/PathOpsFuzz763Test.cpp",
|
|
"$_tests/PathOpsInverseTest.cpp",
|
|
"$_tests/PathOpsIssue3651.cpp",
|
|
"$_tests/PathOpsLineIntersectionTest.cpp",
|
|
"$_tests/PathOpsLineParametetersTest.cpp",
|
|
"$_tests/PathOpsOpCircleThreadedTest.cpp",
|
|
"$_tests/PathOpsOpCubicThreadedTest.cpp",
|
|
"$_tests/PathOpsOpLoopThreadedTest.cpp",
|
|
"$_tests/PathOpsOpRectThreadedTest.cpp",
|
|
"$_tests/PathOpsOpTest.cpp",
|
|
"$_tests/PathOpsQuadIntersectionTest.cpp",
|
|
"$_tests/PathOpsQuadIntersectionTestData.cpp",
|
|
"$_tests/PathOpsQuadLineIntersectionTest.cpp",
|
|
"$_tests/PathOpsQuadLineIntersectionThreadedTest.cpp",
|
|
"$_tests/PathOpsQuadReduceOrderTest.cpp",
|
|
"$_tests/PathOpsSimplifyDegenerateThreadedTest.cpp",
|
|
"$_tests/PathOpsSimplifyFailTest.cpp",
|
|
"$_tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp",
|
|
"$_tests/PathOpsSimplifyQuadThreadedTest.cpp",
|
|
"$_tests/PathOpsSimplifyRectThreadedTest.cpp",
|
|
"$_tests/PathOpsSimplifyTest.cpp",
|
|
"$_tests/PathOpsSimplifyTrianglesThreadedTest.cpp",
|
|
"$_tests/PathOpsSkpTest.cpp",
|
|
"$_tests/PathOpsTestCommon.cpp",
|
|
"$_tests/PathOpsThreadedCommon.cpp",
|
|
"$_tests/PathOpsThreeWayTest.cpp",
|
|
"$_tests/PathOpsTigerTest.cpp",
|
|
"$_tests/PathOpsTightBoundsTest.cpp",
|
|
"$_tests/PathOpsTypesTest.cpp",
|
|
]
|