Skip to content

Fix effect tests #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: uwp/main
Choose a base branch
from
Open

Fix effect tests #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6748439
Remove WinVer
benstevens48 Jan 4, 2025
bf875de
fix effects order
benstevens48 Jan 4, 2025
e0a1533
Merge branch 'master' into fix-effect-tests
benstevens48 Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions tools/codegen/exe/Settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license
<Namespace Name="Effects">
<Enum Name="EffectInterpolationMode" ShouldProject="false" ProjectedNameOverride="CanvasImageInterpolation" Namespace="Microsoft.Graphics.Canvas"/>
<Enum Name="EffectScaleMode" ShouldProject="false" ProjectedNameOverride="CanvasImageInterpolation" Namespace="Microsoft.Graphics.Canvas"/>
<Enum Name="EffectInputColorSpace" ShouldProject="true" ProjectedNameOverride="EffectHueColorSpace" WinVer="_WIN32_WINNT_WIN10">
<Enum Name="EffectInputColorSpace" ShouldProject="true" ProjectedNameOverride="EffectHueColorSpace">
<Field Name="HSV" ProjectedNameOverride="Hsv"/>
<Field Name="HSL" ProjectedNameOverride="Hsl"/>
</Enum>
Expand Down Expand Up @@ -246,64 +246,64 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license
<Property Name="ScaleMode" ProjectedNameOverride="InterpolationMode"/>
<Property Name="Bias" ProjectedNameOverride="Offset"/>
</Effect>
<Effect Name="ChromaKeyEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="ContrastEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="ChromaKeyEffect"/>
<Effect Name="ContrastEffect">
<Property Name="ClampInput" ProjectedNameOverride="ClampSource"/>
</Effect>
<Effect Name="EdgeDetectionEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="EdgeDetectionEffect">
<Property Name="Strength" ProjectedNameOverride="Amount"/>
<Property Name="BlurRadius" ProjectedNameOverride="BlurAmount"/>
</Effect>
<Effect Name="EmbossEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="EmbossEffect">
<Property Name="Height" ProjectedNameOverride="Amount"/>
<Property Name="Direction" ProjectedNameOverride="Angle" ConvertRadiansToDegrees="true"/>
</Effect>
<Effect Name="ExposureEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="ExposureEffect">
<Property Name="ExposureValue" ProjectedNameOverride="Exposure"/>
</Effect>
<Effect Name="GrayscaleEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="HighlightsandShadowsEffect" ProjectedNameOverride="HighlightsAndShadowsEffect" CLSIDOverride="CLSID_D2D1HighlightsShadows" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="GrayscaleEffect"/>
<Effect Name="HighlightsandShadowsEffect" ProjectedNameOverride="HighlightsAndShadowsEffect" CLSIDOverride="CLSID_D2D1HighlightsShadows">
<Property Name="MaskBlurRadius" ProjectedNameOverride="MaskBlurAmount"/>
<Property Name="InputGamma" ProjectedNameOverride="SourceIsLinearGamma" Type="boolean" IsHandCoded="true"/>
</Effect>
<Effect Name="HueToRgbEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="HueToRgbEffect">
<Property Name="InputColorSpace" ProjectedNameOverride="SourceColorSpace"/>
</Effect>
<Effect Name="InvertEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="LookupTable3DEffect" ProjectedNameOverride="TableTransfer3DEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="InvertEffect"/>
<Effect Name="LookupTable3DEffect" ProjectedNameOverride="TableTransfer3DEffect">
<Property Name="Lut" ProjectedNameOverride="Table"/>
</Effect>
<Effect Name="PosterizeEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="RgbToHueEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="SepiaEffect" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="SharpenEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="PosterizeEffect"/>
<Effect Name="RgbToHueEffect"/>
<Effect Name="SepiaEffect"/>
<Effect Name="SharpenEffect">
<Property Name="Sharpness" ProjectedNameOverride="Amount"/>
</Effect>
<Effect Name="StraightenEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="StraightenEffect">
<Property Name="Angle" ConvertRadiansToDegrees="true"/>
<Property Name="ScaleMode" ProjectedNameOverride="InterpolationMode"/>
</Effect>
<Effect Name="TemperatureAndTintEffect" CLSIDOverride="CLSID_D2D1TemperatureTint" WinVer="_WIN32_WINNT_WIN10"/>
<Effect Name="VignetteEffect" WinVer="_WIN32_WINNT_WIN10">
<Effect Name="TemperatureAndTintEffect" CLSIDOverride="CLSID_D2D1TemperatureTint"/>
<Effect Name="VignetteEffect">
<Property Name="TransitionSize" ProjectedNameOverride="Amount"/>
<Property Name="Strength" ProjectedNameOverride="Curve"/>
</Effect>
<Effect Name="AlphaMaskEffect" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="ID2D1Factory5">
<Effect Name="AlphaMaskEffect" IsSupportedCheck="ID2D1Factory5">
<Input Name="Destination" ProjectedNameOverride="Source"/>
<Input Name="Mask" ProjectedNameOverride="AlphaMask"/>
</Effect>
<Effect Name="CrossFadeEffect" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="ID2D1Factory5">
<Effect Name="CrossFadeEffect" IsSupportedCheck="ID2D1Factory5">
<Input Name="Source" ProjectedNameOverride="Source1"/>
<Input Name="Destination" ProjectedNameOverride="Source2"/>
<Property Name="Weight" ProjectedNameOverride="CrossFade"/>
</Effect>
<Effect Name="OpacityEffect" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="ID2D1Factory5"/>
<Effect Name="TintEffect" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="ID2D1Factory5"/>
<Effect Name="HDRToneMapEffect" ProjectedNameOverride="HdrToneMapEffect" CLSIDOverride="CLSID_D2D1HdrToneMap" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="Registered"/>
<Effect Name="OpacityEffect" IsSupportedCheck="ID2D1Factory5"/>
<Effect Name="TintEffect" IsSupportedCheck="ID2D1Factory5"/>
<Effect Name="HDRToneMapEffect" ProjectedNameOverride="HdrToneMapEffect" CLSIDOverride="CLSID_D2D1HdrToneMap" IsSupportedCheck="Registered"/>
<Enum Name="HDRToneMapEffectDisplayMode" ProjectedNameOverride="HdrToneMapEffectDisplayMode">
<Field Name="SDR" ProjectedNameOverride="Sdr"/>
<Field Name="HDR" ProjectedNameOverride="Hdr"/>
</Enum>
<Effect Name="WhiteLevelAdjustmentEffect" WinVer="_WIN32_WINNT_WIN10" IsSupportedCheck="Registered"/>
<Effect Name="WhiteLevelAdjustmentEffect" IsSupportedCheck="Registered"/>
</Namespace>
</Settings>
84 changes: 42 additions & 42 deletions winrt/lib/effects/generated/EffectMakers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,130 +6,130 @@

#include "pch.h"

#include "AlphaMaskEffect.h"
#include "ArithmeticCompositeEffect.h"
#include "AtlasEffect.h"
#include "BlendEffect.h"
#include "BorderEffect.h"
#include "BrightnessEffect.h"
#include "ChromaKeyEffect.h"
#include "ColorManagementEffect.h"
#include "ColorMatrixEffect.h"
#include "ColorSourceEffect.h"
#include "CompositeEffect.h"
#include "ContrastEffect.h"
#include "ConvolveMatrixEffect.h"
#include "CropEffect.h"
#include "CrossFadeEffect.h"
#include "DirectionalBlurEffect.h"
#include "DiscreteTransferEffect.h"
#include "DisplacementMapEffect.h"
#include "DistantDiffuseEffect.h"
#include "DistantSpecularEffect.h"
#include "DpiCompensationEffect.h"
#include "EdgeDetectionEffect.h"
#include "EmbossEffect.h"
#include "ExposureEffect.h"
#include "GammaTransferEffect.h"
#include "GaussianBlurEffect.h"
#include "GrayscaleEffect.h"
#include "HdrToneMapEffect.h"
#include "HighlightsAndShadowsEffect.h"
#include "HueRotationEffect.h"
#include "HueToRgbEffect.h"
#include "InvertEffect.h"
#include "LinearTransferEffect.h"
#include "LuminanceToAlphaEffect.h"
#include "MorphologyEffect.h"
#include "OpacityEffect.h"
#include "OpacityMetadataEffect.h"
#include "PointDiffuseEffect.h"
#include "PointSpecularEffect.h"
#include "PosterizeEffect.h"
#include "PremultiplyEffect.h"
#include "RgbToHueEffect.h"
#include "SaturationEffect.h"
#include "ScaleEffect.h"
#include "SepiaEffect.h"
#include "ShadowEffect.h"
#include "SharpenEffect.h"
#include "SpotDiffuseEffect.h"
#include "SpotSpecularEffect.h"
#include "StraightenEffect.h"
#include "TableTransfer3DEffect.h"
#include "TableTransferEffect.h"
#include "TemperatureAndTintEffect.h"
#include "TileEffect.h"
#include "TintEffect.h"
#include "Transform2DEffect.h"
#include "Transform3DEffect.h"
#include "TurbulenceEffect.h"
#include "UnPremultiplyEffect.h"
#include "AlphaMaskEffect.h"
#include "ChromaKeyEffect.h"
#include "ContrastEffect.h"
#include "CrossFadeEffect.h"
#include "EdgeDetectionEffect.h"
#include "EmbossEffect.h"
#include "ExposureEffect.h"
#include "GrayscaleEffect.h"
#include "HdrToneMapEffect.h"
#include "HighlightsAndShadowsEffect.h"
#include "HueToRgbEffect.h"
#include "InvertEffect.h"
#include "OpacityEffect.h"
#include "PosterizeEffect.h"
#include "RgbToHueEffect.h"
#include "SepiaEffect.h"
#include "SharpenEffect.h"
#include "StraightenEffect.h"
#include "TableTransfer3DEffect.h"
#include "TemperatureAndTintEffect.h"
#include "TintEffect.h"
#include "VignetteEffect.h"
#include "WhiteLevelAdjustmentEffect.h"


std::pair<IID, CanvasEffect::MakeEffectFunction> CanvasEffect::m_effectMakers[] =
{
{ AlphaMaskEffect::EffectId(), MakeEffect<AlphaMaskEffect> },
{ ArithmeticCompositeEffect::EffectId(), MakeEffect<ArithmeticCompositeEffect> },
{ AtlasEffect::EffectId(), MakeEffect<AtlasEffect> },
{ BlendEffect::EffectId(), MakeEffect<BlendEffect> },
{ BorderEffect::EffectId(), MakeEffect<BorderEffect> },
{ BrightnessEffect::EffectId(), MakeEffect<BrightnessEffect> },
{ ChromaKeyEffect::EffectId(), MakeEffect<ChromaKeyEffect> },
{ ColorManagementEffect::EffectId(), MakeEffect<ColorManagementEffect> },
{ ColorMatrixEffect::EffectId(), MakeEffect<ColorMatrixEffect> },
{ ColorSourceEffect::EffectId(), MakeEffect<ColorSourceEffect> },
{ CompositeEffect::EffectId(), MakeEffect<CompositeEffect> },
{ ContrastEffect::EffectId(), MakeEffect<ContrastEffect> },
{ ConvolveMatrixEffect::EffectId(), MakeEffect<ConvolveMatrixEffect> },
{ CropEffect::EffectId(), MakeEffect<CropEffect> },
{ CrossFadeEffect::EffectId(), MakeEffect<CrossFadeEffect> },
{ DirectionalBlurEffect::EffectId(), MakeEffect<DirectionalBlurEffect> },
{ DiscreteTransferEffect::EffectId(), MakeEffect<DiscreteTransferEffect> },
{ DisplacementMapEffect::EffectId(), MakeEffect<DisplacementMapEffect> },
{ DistantDiffuseEffect::EffectId(), MakeEffect<DistantDiffuseEffect> },
{ DistantSpecularEffect::EffectId(), MakeEffect<DistantSpecularEffect> },
{ DpiCompensationEffect::EffectId(), MakeEffect<DpiCompensationEffect> },
{ EdgeDetectionEffect::EffectId(), MakeEffect<EdgeDetectionEffect> },
{ EmbossEffect::EffectId(), MakeEffect<EmbossEffect> },
{ ExposureEffect::EffectId(), MakeEffect<ExposureEffect> },
{ GammaTransferEffect::EffectId(), MakeEffect<GammaTransferEffect> },
{ GaussianBlurEffect::EffectId(), MakeEffect<GaussianBlurEffect> },
{ GrayscaleEffect::EffectId(), MakeEffect<GrayscaleEffect> },
{ HdrToneMapEffect::EffectId(), MakeEffect<HdrToneMapEffect> },
{ HighlightsAndShadowsEffect::EffectId(), MakeEffect<HighlightsAndShadowsEffect> },
{ HueRotationEffect::EffectId(), MakeEffect<HueRotationEffect> },
{ HueToRgbEffect::EffectId(), MakeEffect<HueToRgbEffect> },
{ InvertEffect::EffectId(), MakeEffect<InvertEffect> },
{ LinearTransferEffect::EffectId(), MakeEffect<LinearTransferEffect> },
{ LuminanceToAlphaEffect::EffectId(), MakeEffect<LuminanceToAlphaEffect> },
{ MorphologyEffect::EffectId(), MakeEffect<MorphologyEffect> },
{ OpacityEffect::EffectId(), MakeEffect<OpacityEffect> },
{ OpacityMetadataEffect::EffectId(), MakeEffect<OpacityMetadataEffect> },
{ PointDiffuseEffect::EffectId(), MakeEffect<PointDiffuseEffect> },
{ PointSpecularEffect::EffectId(), MakeEffect<PointSpecularEffect> },
{ PosterizeEffect::EffectId(), MakeEffect<PosterizeEffect> },
{ PremultiplyEffect::EffectId(), MakeEffect<PremultiplyEffect> },
{ RgbToHueEffect::EffectId(), MakeEffect<RgbToHueEffect> },
{ SaturationEffect::EffectId(), MakeEffect<SaturationEffect> },
{ ScaleEffect::EffectId(), MakeEffect<ScaleEffect> },
{ SepiaEffect::EffectId(), MakeEffect<SepiaEffect> },
{ ShadowEffect::EffectId(), MakeEffect<ShadowEffect> },
{ SharpenEffect::EffectId(), MakeEffect<SharpenEffect> },
{ SpotDiffuseEffect::EffectId(), MakeEffect<SpotDiffuseEffect> },
{ SpotSpecularEffect::EffectId(), MakeEffect<SpotSpecularEffect> },
{ StraightenEffect::EffectId(), MakeEffect<StraightenEffect> },
{ TableTransfer3DEffect::EffectId(), MakeEffect<TableTransfer3DEffect> },
{ TableTransferEffect::EffectId(), MakeEffect<TableTransferEffect> },
{ TemperatureAndTintEffect::EffectId(), MakeEffect<TemperatureAndTintEffect> },
{ TileEffect::EffectId(), MakeEffect<TileEffect> },
{ TintEffect::EffectId(), MakeEffect<TintEffect> },
{ Transform2DEffect::EffectId(), MakeEffect<Transform2DEffect> },
{ Transform3DEffect::EffectId(), MakeEffect<Transform3DEffect> },
{ TurbulenceEffect::EffectId(), MakeEffect<TurbulenceEffect> },
{ UnPremultiplyEffect::EffectId(), MakeEffect<UnPremultiplyEffect> },
{ AlphaMaskEffect::EffectId(), MakeEffect<AlphaMaskEffect> },
{ ChromaKeyEffect::EffectId(), MakeEffect<ChromaKeyEffect> },
{ ContrastEffect::EffectId(), MakeEffect<ContrastEffect> },
{ CrossFadeEffect::EffectId(), MakeEffect<CrossFadeEffect> },
{ EdgeDetectionEffect::EffectId(), MakeEffect<EdgeDetectionEffect> },
{ EmbossEffect::EffectId(), MakeEffect<EmbossEffect> },
{ ExposureEffect::EffectId(), MakeEffect<ExposureEffect> },
{ GrayscaleEffect::EffectId(), MakeEffect<GrayscaleEffect> },
{ HdrToneMapEffect::EffectId(), MakeEffect<HdrToneMapEffect> },
{ HighlightsAndShadowsEffect::EffectId(), MakeEffect<HighlightsAndShadowsEffect> },
{ HueToRgbEffect::EffectId(), MakeEffect<HueToRgbEffect> },
{ InvertEffect::EffectId(), MakeEffect<InvertEffect> },
{ OpacityEffect::EffectId(), MakeEffect<OpacityEffect> },
{ PosterizeEffect::EffectId(), MakeEffect<PosterizeEffect> },
{ RgbToHueEffect::EffectId(), MakeEffect<RgbToHueEffect> },
{ SepiaEffect::EffectId(), MakeEffect<SepiaEffect> },
{ SharpenEffect::EffectId(), MakeEffect<SharpenEffect> },
{ StraightenEffect::EffectId(), MakeEffect<StraightenEffect> },
{ TableTransfer3DEffect::EffectId(), MakeEffect<TableTransfer3DEffect> },
{ TemperatureAndTintEffect::EffectId(), MakeEffect<TemperatureAndTintEffect> },
{ TintEffect::EffectId(), MakeEffect<TintEffect> },
{ VignetteEffect::EffectId(), MakeEffect<VignetteEffect> },
{ WhiteLevelAdjustmentEffect::EffectId(), MakeEffect<WhiteLevelAdjustmentEffect> },

Expand Down