diff --git a/tools/codegen/exe/Settings.xml b/tools/codegen/exe/Settings.xml index fc2d59887..0f8f9abeb 100644 --- a/tools/codegen/exe/Settings.xml +++ b/tools/codegen/exe/Settings.xml @@ -97,7 +97,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license - + @@ -246,58 +246,64 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license - - + + - + - + - + - - + + - + - - + + - - - - + + + + - + - - + + - + - + - - + + + + + + + + diff --git a/tools/codegen/exe/apiref/UpdateApiResourceFiles.cmd b/tools/codegen/exe/apiref/UpdateApiResourceFiles.cmd index 4bd4b5332..cafabaeb8 100644 --- a/tools/codegen/exe/apiref/UpdateApiResourceFiles.cmd +++ b/tools/codegen/exe/apiref/UpdateApiResourceFiles.cmd @@ -97,6 +97,7 @@ SET FILE_LIST=^ GammaTransfer.xml ^ GaussianBlur.xml ^ Grayscale.xml ^ + HDRToneMap.xml ^ HighlightsShadows.xml ^ HueRotation.xml ^ HueToRgb.xml ^ @@ -125,7 +126,8 @@ SET FILE_LIST=^ Tint.xml ^ Turbulence.xml ^ UnPremultiply.xml ^ - Vignette.xml + Vignette.xml ^ + WhiteLevelAdjustment.xml CALL :UPDATE_FILES diff --git a/tools/codegen/exe/apiref/effects/HdrToneMap.xml b/tools/codegen/exe/apiref/effects/HdrToneMap.xml new file mode 100644 index 000000000..d43a07bf6 --- /dev/null +++ b/tools/codegen/exe/apiref/effects/HdrToneMap.xml @@ -0,0 +1,43 @@ + + + + + + <_locDefinition> + <_locDefault _loc="locNone" /> + <_locTag _locAttrData="displayname">Field + <_locTag _locAttrData="name">Input + <_locTag _locAttrData="value">Property + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/codegen/exe/apiref/effects/WhiteLevelAdjustment.xml b/tools/codegen/exe/apiref/effects/WhiteLevelAdjustment.xml new file mode 100644 index 000000000..af6d156a9 --- /dev/null +++ b/tools/codegen/exe/apiref/effects/WhiteLevelAdjustment.xml @@ -0,0 +1,36 @@ + + + + + + <_locDefinition> + <_locDefault _loc="locNone" /> + <_locTag _locAttrData="displayname">Field + <_locTag _locAttrData="name">Input + <_locTag _locAttrData="value">Property + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/codegen/exe/codegen.exe.csproj b/tools/codegen/exe/codegen.exe.csproj index a6f16431c..c53d73030 100644 --- a/tools/codegen/exe/codegen.exe.csproj +++ b/tools/codegen/exe/codegen.exe.csproj @@ -128,6 +128,8 @@ + + + + + + Microsoft.Graphics.Canvas + + + + + + This effect adjusts the dynamic range of an image to better suit its content to the capability of the output display. + + +

This Windows Runtime type corresponds to the + D2D HDR tone map effect.

+ + + + Initializes a new instance of the HdrToneMapEffect class. + + + Gets or sets the input source for the effect. + + + The maximum light level (or MaxCLL) of the image, in nits. Default value 4000. + + + The MaxCLL supported by the output target, in nits - typically set to the MaxCLL of the display. Default value 300. + + + When set to Hdr, the tone mapping curve is adjusted to better fit the fit the behavior of common HDR displays. Default value Sdr. + + + + The display mode used for the effect. + + + Specifies that the tone mapper algorithm be optimized for best appearance on a standard dynamic range (SDR) display. + + + Specifies that the tone mapper algorithm be optimized for best appearance on a high dynamic range (HDR) display. + + + + + + + diff --git a/winrt/docsrc/effects/WhiteLevelAdjustmentEffect.xml b/winrt/docsrc/effects/WhiteLevelAdjustmentEffect.xml new file mode 100644 index 000000000..8924a6aca --- /dev/null +++ b/winrt/docsrc/effects/WhiteLevelAdjustmentEffect.xml @@ -0,0 +1,40 @@ + + + + + + Microsoft.Graphics.Canvas + + + + + + This effect allows the white level of an image to be linearly scaled. This is especially helpful when you convert between display-referred luminance space and scene-referred luminance space, or vice versa. + + +

This Windows Runtime type corresponds to the + D2D White level adjustment effect.

+ + + + Initializes a new instance of the WhiteLevelAdjustmentEffect class. + + + Gets or sets the input source for the effect. + + + The white level of the input image, in nits. Default value 80. + + + The white level of the output image, in nits. Default value 80. + + + + + + + diff --git a/winrt/lib/Canvas.abi.idl b/winrt/lib/Canvas.abi.idl index 9dd441acf..64c92a57b 100644 --- a/winrt/lib/Canvas.abi.idl +++ b/winrt/lib/Canvas.abi.idl @@ -100,6 +100,7 @@ cpp_quote("#endif") #include "effects\generated\GammaTransferEffect.abi.idl" #include "effects\generated\GaussianBlurEffect.abi.idl" #include "effects\generated\GrayscaleEffect.abi.idl" +#include "effects\generated\HdrToneMapEffect.abi.idl" #include "effects\generated\HighlightsAndShadowsEffect.abi.idl" #include "effects\generated\HueRotationEffect.abi.idl" #include "effects\generated\HueToRgbEffect.abi.idl" @@ -132,3 +133,4 @@ cpp_quote("#endif") #include "effects\generated\TurbulenceEffect.abi.idl" #include "effects\generated\UnPremultiplyEffect.abi.idl" #include "effects\generated\VignetteEffect.abi.idl" +#include "effects\generated\WhiteLevelAdjustmentEffect.abi.idl" diff --git a/winrt/lib/effects/generated/EffectMakers.cpp b/winrt/lib/effects/generated/EffectMakers.cpp index 6e6aa21f0..27ebfdc46 100644 --- a/winrt/lib/effects/generated/EffectMakers.cpp +++ b/winrt/lib/effects/generated/EffectMakers.cpp @@ -6,128 +6,132 @@ #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 "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 CanvasEffect::m_effectMakers[] = { + { AlphaMaskEffect::EffectId(), MakeEffect }, { ArithmeticCompositeEffect::EffectId(), MakeEffect }, { AtlasEffect::EffectId(), MakeEffect }, { BlendEffect::EffectId(), MakeEffect }, { BorderEffect::EffectId(), MakeEffect }, { BrightnessEffect::EffectId(), MakeEffect }, + { ChromaKeyEffect::EffectId(), MakeEffect }, { ColorManagementEffect::EffectId(), MakeEffect }, { ColorMatrixEffect::EffectId(), MakeEffect }, { ColorSourceEffect::EffectId(), MakeEffect }, { CompositeEffect::EffectId(), MakeEffect }, + { ContrastEffect::EffectId(), MakeEffect }, { ConvolveMatrixEffect::EffectId(), MakeEffect }, { CropEffect::EffectId(), MakeEffect }, + { CrossFadeEffect::EffectId(), MakeEffect }, { DirectionalBlurEffect::EffectId(), MakeEffect }, { DiscreteTransferEffect::EffectId(), MakeEffect }, { DisplacementMapEffect::EffectId(), MakeEffect }, { DistantDiffuseEffect::EffectId(), MakeEffect }, { DistantSpecularEffect::EffectId(), MakeEffect }, { DpiCompensationEffect::EffectId(), MakeEffect }, + { EdgeDetectionEffect::EffectId(), MakeEffect }, + { EmbossEffect::EffectId(), MakeEffect }, + { ExposureEffect::EffectId(), MakeEffect }, { GammaTransferEffect::EffectId(), MakeEffect }, { GaussianBlurEffect::EffectId(), MakeEffect }, + { GrayscaleEffect::EffectId(), MakeEffect }, + { HdrToneMapEffect::EffectId(), MakeEffect }, + { HighlightsAndShadowsEffect::EffectId(), MakeEffect }, { HueRotationEffect::EffectId(), MakeEffect }, + { HueToRgbEffect::EffectId(), MakeEffect }, + { InvertEffect::EffectId(), MakeEffect }, { LinearTransferEffect::EffectId(), MakeEffect }, { LuminanceToAlphaEffect::EffectId(), MakeEffect }, { MorphologyEffect::EffectId(), MakeEffect }, + { OpacityEffect::EffectId(), MakeEffect }, { OpacityMetadataEffect::EffectId(), MakeEffect }, { PointDiffuseEffect::EffectId(), MakeEffect }, { PointSpecularEffect::EffectId(), MakeEffect }, + { PosterizeEffect::EffectId(), MakeEffect }, { PremultiplyEffect::EffectId(), MakeEffect }, + { RgbToHueEffect::EffectId(), MakeEffect }, { SaturationEffect::EffectId(), MakeEffect }, { ScaleEffect::EffectId(), MakeEffect }, + { SepiaEffect::EffectId(), MakeEffect }, { ShadowEffect::EffectId(), MakeEffect }, + { SharpenEffect::EffectId(), MakeEffect }, { SpotDiffuseEffect::EffectId(), MakeEffect }, { SpotSpecularEffect::EffectId(), MakeEffect }, + { StraightenEffect::EffectId(), MakeEffect }, + { TableTransfer3DEffect::EffectId(), MakeEffect }, { TableTransferEffect::EffectId(), MakeEffect }, + { TemperatureAndTintEffect::EffectId(), MakeEffect }, { TileEffect::EffectId(), MakeEffect }, + { TintEffect::EffectId(), MakeEffect }, { Transform2DEffect::EffectId(), MakeEffect }, { Transform3DEffect::EffectId(), MakeEffect }, { TurbulenceEffect::EffectId(), MakeEffect }, { UnPremultiplyEffect::EffectId(), MakeEffect }, - { AlphaMaskEffect::EffectId(), MakeEffect }, - { ChromaKeyEffect::EffectId(), MakeEffect }, - { ContrastEffect::EffectId(), MakeEffect }, - { CrossFadeEffect::EffectId(), MakeEffect }, - { EdgeDetectionEffect::EffectId(), MakeEffect }, - { EmbossEffect::EffectId(), MakeEffect }, - { ExposureEffect::EffectId(), MakeEffect }, - { GrayscaleEffect::EffectId(), MakeEffect }, - { HighlightsAndShadowsEffect::EffectId(), MakeEffect }, - { HueToRgbEffect::EffectId(), MakeEffect }, - { InvertEffect::EffectId(), MakeEffect }, - { OpacityEffect::EffectId(), MakeEffect }, - { PosterizeEffect::EffectId(), MakeEffect }, - { RgbToHueEffect::EffectId(), MakeEffect }, - { SepiaEffect::EffectId(), MakeEffect }, - { SharpenEffect::EffectId(), MakeEffect }, - { StraightenEffect::EffectId(), MakeEffect }, - { TableTransfer3DEffect::EffectId(), MakeEffect }, - { TemperatureAndTintEffect::EffectId(), MakeEffect }, - { TintEffect::EffectId(), MakeEffect }, { VignetteEffect::EffectId(), MakeEffect }, + { WhiteLevelAdjustmentEffect::EffectId(), MakeEffect }, { GUID_NULL, nullptr } }; diff --git a/winrt/lib/effects/generated/HdrToneMapEffect.abi.idl b/winrt/lib/effects/generated/HdrToneMapEffect.abi.idl new file mode 100644 index 000000000..1efd138f5 --- /dev/null +++ b/winrt/lib/effects/generated/HdrToneMapEffect.abi.idl @@ -0,0 +1,53 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +namespace Microsoft.Graphics.Canvas.Effects +{ + [version(VERSION)] + typedef enum HdrToneMapEffectDisplayMode + { + Sdr = 0, + Hdr = 1 + } HdrToneMapEffectDisplayMode; + + runtimeclass HdrToneMapEffect; + + [version(VERSION), uuid(2004FAAC-663E-5DF4-B4CD-A5AFBFD9341F), exclusiveto(HdrToneMapEffect)] + interface IHdrToneMapEffect : IInspectable + requires ICanvasEffect + { + [propget] + HRESULT InputMaxLuminance([out, retval] float* value); + + [propput] + HRESULT InputMaxLuminance([in] float value); + + [propget] + HRESULT OutputMaxLuminance([out, retval] float* value); + + [propput] + HRESULT OutputMaxLuminance([in] float value); + + [propget] + HRESULT DisplayMode([out, retval] HdrToneMapEffectDisplayMode* value); + + [propput] + HRESULT DisplayMode([in] HdrToneMapEffectDisplayMode value); + + [propget] + HRESULT Source([out, retval] IGRAPHICSEFFECTSOURCE** source); + + [propput] + HRESULT Source([in] IGRAPHICSEFFECTSOURCE* source); + + }; + + [STANDARD_ATTRIBUTES, activatable(VERSION)] + runtimeclass HdrToneMapEffect + { + [default] interface IHdrToneMapEffect; + } +} diff --git a/winrt/lib/effects/generated/HdrToneMapEffect.cpp b/winrt/lib/effects/generated/HdrToneMapEffect.cpp new file mode 100644 index 000000000..c732a3915 --- /dev/null +++ b/winrt/lib/effects/generated/HdrToneMapEffect.cpp @@ -0,0 +1,52 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +#include "pch.h" +#include "HdrToneMapEffect.h" + +namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { namespace Effects +{ + HdrToneMapEffect::HdrToneMapEffect(ICanvasDevice* device, ID2D1Effect* effect) + : CanvasEffect(EffectId(), 3, 1, true, device, effect, static_cast(this)) + { + if (!effect) + { + // Set default values + SetBoxedProperty(D2D1_HDRTONEMAP_PROP_INPUT_MAX_LUMINANCE, 4000.0f); + SetBoxedProperty(D2D1_HDRTONEMAP_PROP_OUTPUT_MAX_LUMINANCE, 300.0f); + SetBoxedProperty(D2D1_HDRTONEMAP_PROP_DISPLAY_MODE, HdrToneMapEffectDisplayMode::Sdr); + } + } + + IMPLEMENT_EFFECT_PROPERTY(HdrToneMapEffect, + InputMaxLuminance, + float, + float, + D2D1_HDRTONEMAP_PROP_INPUT_MAX_LUMINANCE) + + IMPLEMENT_EFFECT_PROPERTY(HdrToneMapEffect, + OutputMaxLuminance, + float, + float, + D2D1_HDRTONEMAP_PROP_OUTPUT_MAX_LUMINANCE) + + IMPLEMENT_EFFECT_PROPERTY(HdrToneMapEffect, + DisplayMode, + uint32_t, + HdrToneMapEffectDisplayMode, + D2D1_HDRTONEMAP_PROP_DISPLAY_MODE) + + IMPLEMENT_EFFECT_SOURCE_PROPERTY(HdrToneMapEffect, + Source, + 0) + + IMPLEMENT_EFFECT_PROPERTY_MAPPING(HdrToneMapEffect, + { L"InputMaxLuminance", D2D1_HDRTONEMAP_PROP_INPUT_MAX_LUMINANCE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, + { L"OutputMaxLuminance", D2D1_HDRTONEMAP_PROP_OUTPUT_MAX_LUMINANCE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, + { L"DisplayMode", D2D1_HDRTONEMAP_PROP_DISPLAY_MODE, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) + + ActivatableClassWithFactory(HdrToneMapEffect, ::SimpleAgileActivationFactory); +}}}}} diff --git a/winrt/lib/effects/generated/HdrToneMapEffect.h b/winrt/lib/effects/generated/HdrToneMapEffect.h new file mode 100644 index 000000000..08f102987 --- /dev/null +++ b/winrt/lib/effects/generated/HdrToneMapEffect.h @@ -0,0 +1,33 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +#pragma once + +namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { namespace Effects +{ + using namespace ::Microsoft::WRL; + using namespace ABI::Microsoft::Graphics::Canvas; + + class HdrToneMapEffect : public RuntimeClass< + IHdrToneMapEffect, + MixIn>, + public CanvasEffect + { + InspectableClass(RuntimeClass_Microsoft_Graphics_Canvas_Effects_HdrToneMapEffect, BaseTrust); + + public: + HdrToneMapEffect(ICanvasDevice* device = nullptr, ID2D1Effect* effect = nullptr); + + static IID const& EffectId() { return CLSID_D2D1HdrToneMap; } + + EFFECT_PROPERTY(InputMaxLuminance, float); + EFFECT_PROPERTY(OutputMaxLuminance, float); + EFFECT_PROPERTY(DisplayMode, HdrToneMapEffectDisplayMode); + EFFECT_PROPERTY(Source, IGraphicsEffectSource*); + + EFFECT_PROPERTY_MAPPING(); + }; +}}}}} diff --git a/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.abi.idl b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.abi.idl new file mode 100644 index 000000000..598b255f3 --- /dev/null +++ b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.abi.idl @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +namespace Microsoft.Graphics.Canvas.Effects +{ + runtimeclass WhiteLevelAdjustmentEffect; + + [version(VERSION), uuid(0B0B945C-96F7-56B4-8317-01DE629FC904), exclusiveto(WhiteLevelAdjustmentEffect)] + interface IWhiteLevelAdjustmentEffect : IInspectable + requires ICanvasEffect + { + [propget] + HRESULT InputWhiteLevel([out, retval] float* value); + + [propput] + HRESULT InputWhiteLevel([in] float value); + + [propget] + HRESULT OutputWhiteLevel([out, retval] float* value); + + [propput] + HRESULT OutputWhiteLevel([in] float value); + + [propget] + HRESULT Source([out, retval] IGRAPHICSEFFECTSOURCE** source); + + [propput] + HRESULT Source([in] IGRAPHICSEFFECTSOURCE* source); + + }; + + [STANDARD_ATTRIBUTES, activatable(VERSION)] + runtimeclass WhiteLevelAdjustmentEffect + { + [default] interface IWhiteLevelAdjustmentEffect; + } +} diff --git a/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.cpp b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.cpp new file mode 100644 index 000000000..c677ee9fd --- /dev/null +++ b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.cpp @@ -0,0 +1,44 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +#include "pch.h" +#include "WhiteLevelAdjustmentEffect.h" + +namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { namespace Effects +{ + WhiteLevelAdjustmentEffect::WhiteLevelAdjustmentEffect(ICanvasDevice* device, ID2D1Effect* effect) + : CanvasEffect(EffectId(), 2, 1, true, device, effect, static_cast(this)) + { + if (!effect) + { + // Set default values + SetBoxedProperty(D2D1_WHITELEVELADJUSTMENT_PROP_INPUT_WHITE_LEVEL, 80.0f); + SetBoxedProperty(D2D1_WHITELEVELADJUSTMENT_PROP_OUTPUT_WHITE_LEVEL, 80.0f); + } + } + + IMPLEMENT_EFFECT_PROPERTY(WhiteLevelAdjustmentEffect, + InputWhiteLevel, + float, + float, + D2D1_WHITELEVELADJUSTMENT_PROP_INPUT_WHITE_LEVEL) + + IMPLEMENT_EFFECT_PROPERTY(WhiteLevelAdjustmentEffect, + OutputWhiteLevel, + float, + float, + D2D1_WHITELEVELADJUSTMENT_PROP_OUTPUT_WHITE_LEVEL) + + IMPLEMENT_EFFECT_SOURCE_PROPERTY(WhiteLevelAdjustmentEffect, + Source, + 0) + + IMPLEMENT_EFFECT_PROPERTY_MAPPING(WhiteLevelAdjustmentEffect, + { L"InputWhiteLevel", D2D1_WHITELEVELADJUSTMENT_PROP_INPUT_WHITE_LEVEL, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }, + { L"OutputWhiteLevel", D2D1_WHITELEVELADJUSTMENT_PROP_OUTPUT_WHITE_LEVEL, GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT }) + + ActivatableClassWithFactory(WhiteLevelAdjustmentEffect, ::SimpleAgileActivationFactory); +}}}}} diff --git a/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.h b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.h new file mode 100644 index 000000000..fd815bbf8 --- /dev/null +++ b/winrt/lib/effects/generated/WhiteLevelAdjustmentEffect.h @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +// This file was automatically generated. Please do not edit it manually. + +#pragma once + +namespace ABI { namespace Microsoft { namespace Graphics { namespace Canvas { namespace Effects +{ + using namespace ::Microsoft::WRL; + using namespace ABI::Microsoft::Graphics::Canvas; + + class WhiteLevelAdjustmentEffect : public RuntimeClass< + IWhiteLevelAdjustmentEffect, + MixIn>, + public CanvasEffect + { + InspectableClass(RuntimeClass_Microsoft_Graphics_Canvas_Effects_WhiteLevelAdjustmentEffect, BaseTrust); + + public: + WhiteLevelAdjustmentEffect(ICanvasDevice* device = nullptr, ID2D1Effect* effect = nullptr); + + static IID const& EffectId() { return CLSID_D2D1WhiteLevelAdjustment; } + + EFFECT_PROPERTY(InputWhiteLevel, float); + EFFECT_PROPERTY(OutputWhiteLevel, float); + EFFECT_PROPERTY(Source, IGraphicsEffectSource*); + + EFFECT_PROPERTY_MAPPING(); + }; +}}}}} diff --git a/winrt/lib/winrt.lib.uap.vcxproj b/winrt/lib/winrt.lib.uap.vcxproj index ceb2b3edb..b64ab16cc 100644 --- a/winrt/lib/winrt.lib.uap.vcxproj +++ b/winrt/lib/winrt.lib.uap.vcxproj @@ -104,6 +104,7 @@ + @@ -114,6 +115,7 @@ + @@ -263,6 +265,7 @@ + @@ -273,6 +276,7 @@ + Create @@ -450,6 +454,7 @@ + @@ -460,6 +465,7 @@ + diff --git a/winrt/lib/winrt.lib.uap.vcxproj.filters b/winrt/lib/winrt.lib.uap.vcxproj.filters index 15fe1b332..8eb934836 100644 --- a/winrt/lib/winrt.lib.uap.vcxproj.filters +++ b/winrt/lib/winrt.lib.uap.vcxproj.filters @@ -313,6 +313,9 @@ effects\generated + + effects\generated + effects\generated @@ -343,6 +346,9 @@ effects\generated + + effects\generated + xaml @@ -781,6 +787,9 @@ effects\generated + + effects\generated + effects\generated @@ -811,6 +820,9 @@ effects\generated + + effects\generated + xaml @@ -1114,6 +1126,9 @@ effects\generated + + effects\generated + effects\generated @@ -1144,6 +1159,9 @@ effects\generated + + effects\generated + geometry