diff --git a/.gitignore b/.gitignore index 8b3e6dd2..e153ea7a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ x64 Samples/Graphics/SimplePBR12/Compiled/ Samples/Tools/errorlookup/errorlookup/project.lock.json /wiki +AppPackages packages !Kits/Telemetry/ARM !Kits/Telemetry/Win32 diff --git a/Kits/DirectXTK/Audio/DynamicSoundEffectInstance.cpp b/Kits/DirectXTK/Audio/DynamicSoundEffectInstance.cpp index 57be0ffe..9661f743 100644 --- a/Kits/DirectXTK/Audio/DynamicSoundEffectInstance.cpp +++ b/Kits/DirectXTK/Audio/DynamicSoundEffectInstance.cpp @@ -26,7 +26,7 @@ class DynamicSoundEffectInstance::Impl : public IVoiceNotify { public: Impl( _In_ AudioEngine* engine, - _In_ DynamicSoundEffectInstance* object, _In_opt_ std::function bufferNeeded, + _In_ DynamicSoundEffectInstance* object, std::function& bufferNeeded, int sampleRate, int channels, int sampleBits, SOUND_EFFECT_INSTANCE_FLAGS flags ) : mBase(), mBufferNeeded( nullptr ), diff --git a/Kits/DirectXTK/Audio/SoundCommon.cpp b/Kits/DirectXTK/Audio/SoundCommon.cpp index fa440487..df6f1e7f 100644 --- a/Kits/DirectXTK/Audio/SoundCommon.cpp +++ b/Kits/DirectXTK/Audio/SoundCommon.cpp @@ -727,7 +727,7 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi dwCalcFlags |= X3DAUDIO_CALCULATE_LPF_REVERB | X3DAUDIO_CALCULATE_REVERB; } - float matrix[ XAUDIO2_MAX_AUDIO_CHANNELS * 8 ]; + float matrix[XAUDIO2_MAX_AUDIO_CHANNELS * 8] = {}; assert( mDSPSettings.SrcChannelCount <= XAUDIO2_MAX_AUDIO_CHANNELS ); assert( mDSPSettings.DstChannelCount <= 8 ); mDSPSettings.pMatrixCoefficients = matrix; @@ -766,7 +766,11 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi if ( reverb ) { - (void)voice->SetOutputMatrix( reverb, 1, 1, &mDSPSettings.ReverbLevel ); + for ( size_t j = 0; j < mDSPSettings.SrcChannelCount; ++j ) + { + matrix[j] = mDSPSettings.ReverbLevel; + } + (void)voice->SetOutputMatrix( reverb, mDSPSettings.SrcChannelCount, 1, matrix ); } if ( mFlags & SoundEffectInstance_ReverbUseFilters ) diff --git a/Kits/DirectXTK/Audio/WaveBankReader.h b/Kits/DirectXTK/Audio/WaveBankReader.h index 239fa0fc..3c6f8149 100644 --- a/Kits/DirectXTK/Audio/WaveBankReader.h +++ b/Kits/DirectXTK/Audio/WaveBankReader.h @@ -28,6 +28,11 @@ namespace DirectX public: WaveBankReader(); +#if !defined(_MSC_VER) || _MSC_VER >= 1900 + WaveBankReader(WaveBankReader&&) = default; + WaveBankReader& operator= (WaveBankReader&&) = default; +#endif + WaveBankReader(WaveBankReader const&) = delete; WaveBankReader& operator= (WaveBankReader const&) = delete; diff --git a/Kits/DirectXTK/DirectXTK_Windows10.vcxproj b/Kits/DirectXTK/DirectXTK_Windows10.vcxproj index 9bbaca8f..e931bdb1 100644 --- a/Kits/DirectXTK/DirectXTK_Windows10.vcxproj +++ b/Kits/DirectXTK/DirectXTK_Windows10.vcxproj @@ -41,6 +41,7 @@ + @@ -270,6 +271,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -316,9 +339,30 @@ + + + + + + + + + + + + + + + + + + + + + @@ -332,11 +376,13 @@ + + @@ -366,6 +412,7 @@ + @@ -409,6 +456,16 @@ Document + + + Document + + + + + Document + + {f4776924-619c-42c7-88b2-82c947ccc9e7} StaticLibrary diff --git a/Kits/DirectXTK/DirectXTK_Windows10.vcxproj.filters b/Kits/DirectXTK/DirectXTK_Windows10.vcxproj.filters index 6261f4f3..fa51ba03 100644 --- a/Kits/DirectXTK/DirectXTK_Windows10.vcxproj.filters +++ b/Kits/DirectXTK/DirectXTK_Windows10.vcxproj.filters @@ -135,6 +135,9 @@ Src\Shared + + Inc + @@ -938,6 +941,141 @@ Src\Shaders\Symbols + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders + + + Src\Shaders\Shared + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + @@ -1057,6 +1195,15 @@ Src + + Src + + + Src + + + Src + diff --git a/Kits/DirectXTK/Inc/PostProcess.h b/Kits/DirectXTK/Inc/PostProcess.h new file mode 100644 index 00000000..896497bf --- /dev/null +++ b/Kits/DirectXTK/Inc/PostProcess.h @@ -0,0 +1,201 @@ +//-------------------------------------------------------------------------------------- +// File: PostProcess.h +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 +//-------------------------------------------------------------------------------------- + +#pragma once + +#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +#error Post-processing not supported for Windows Phone 8.x; requires Direct3D hardware Feature Level 10.0 or better +#endif + +#if defined(_XBOX_ONE) && defined(_TITLE) +#include +#else +#include +#endif + +#include +#include +#include + + +namespace DirectX +{ + //---------------------------------------------------------------------------------- + // Abstract interface representing a post-process pass + class IPostProcess + { + public: + virtual ~IPostProcess() { } + + virtual void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState = nullptr) = 0; + }; + + + //---------------------------------------------------------------------------------- + // Basic post-process + class BasicPostProcess : public IPostProcess + { + public: + enum Effect + { + Copy, + Monochrome, + Sepia, + DownScale_2x2, + DownScale_4x4, + GaussianBlur_5x5, + BloomExtract, + BloomBlur, + Effect_Max + }; + + explicit BasicPostProcess(_In_ ID3D11Device* device); + BasicPostProcess(BasicPostProcess&& moveFrom); + BasicPostProcess& operator= (BasicPostProcess&& moveFrom); + + BasicPostProcess(BasicPostProcess const&) = delete; + BasicPostProcess& operator= (BasicPostProcess const&) = delete; + + virtual ~BasicPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState = nullptr) override; + + // Shader control + void __cdecl SetEffect(Effect fx); + + // Properties + void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value); + + // Sets multiplier for GaussianBlur_5x5 + void __cdecl SetGaussianParameter(float multiplier); + + // Sets parameters for BloomExtract + void __cdecl SetBloomExtractParameter(float threshold); + + // Sets parameters for BloomBlur + void __cdecl SetBloomBlurParameters(bool horizontal, float size, float brightness); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; + + + //---------------------------------------------------------------------------------- + // Dual-texure post-process + class DualPostProcess : public IPostProcess + { + public: + enum Effect + { + Merge, + BloomCombine, + Effect_Max + }; + + explicit DualPostProcess(_In_ ID3D11Device* device); + DualPostProcess(DualPostProcess&& moveFrom); + DualPostProcess& operator= (DualPostProcess&& moveFrom); + + DualPostProcess(DualPostProcess const&) = delete; + DualPostProcess& operator= (DualPostProcess const&) = delete; + + virtual ~DualPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState = nullptr) override; + + // Shader control + void __cdecl SetEffect(Effect fx); + + // Properties + void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value); + void __cdecl SetSourceTexture2(_In_opt_ ID3D11ShaderResourceView* value); + + // Sets parameters for Merge + void __cdecl SetMergeParameters(float weight1, float weight2); + + // Sets parameters for BloomCombine + void __cdecl SetBloomCombineParameters(float bloom, float base, float bloomSaturation, float baseSaturation); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; + + + //---------------------------------------------------------------------------------- + // Tone-map post-process + class ToneMapPostProcess : public IPostProcess + { + public: + enum Operator // Tone-mapping operator + { + None, // Pass-through + Saturate, // Clamp [0,1] + Reinhard, // x/(1+x) + ACESFilmic, + Operator_Max + }; + + enum TransferFunction // Electro-Optical Transfer Function (EOTF) + { + Linear, // Pass-through + SRGB, // sRGB (Rec.709 and approximate sRGB display curve) + ST2084, // HDR10 (Rec.2020 color primaries and ST.2084 display curve) + TransferFunction_Max + }; + + explicit ToneMapPostProcess(_In_ ID3D11Device* device); + ToneMapPostProcess(ToneMapPostProcess&& moveFrom); + ToneMapPostProcess& operator= (ToneMapPostProcess&& moveFrom); + + ToneMapPostProcess(ToneMapPostProcess const&) = delete; + ToneMapPostProcess& operator= (ToneMapPostProcess const&) = delete; + + virtual ~ToneMapPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState = nullptr) override; + + // Shader control + void __cdecl SetOperator(Operator op); + + void __cdecl SetTransferFunction(TransferFunction func); + + #if defined(_XBOX_ONE) && defined(_TITLE) + // Uses Multiple Render Targets to generate both HDR10 and GameDVR SDR signals + void __cdecl SetMRTOutput(bool value = true); + #endif + + // Properties + void __cdecl SetHDRSourceTexture(_In_opt_ ID3D11ShaderResourceView* value); + + // Sets exposure value for LDR tonemap operators + void SetExposure(float exposureValue); + + // Sets ST.2084 parameter for how bright white should be in nits + void SetST2084Parameter(float paperWhiteNits); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; +} diff --git a/Kits/DirectXTK/Readme.txt b/Kits/DirectXTK/Readme.txt index 2379d634..5b4b60b3 100644 --- a/Kits/DirectXTK/Readme.txt +++ b/Kits/DirectXTK/Readme.txt @@ -4,16 +4,18 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 Copyright (c) Microsoft Corporation. All rights reserved. -April 24, 2017 +June 21, 2017 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10, Windows Store apps, Windows phone 8.1 applications, Xbox One exclusive apps, -Windows 8.x Win32 desktop applications, Windows 7 applications, and -Windows Vista Direct3D 11.0 applications. +Windows 8.x Win32 desktop applications, Windows 7 Service Pack 1 applications, and +Windows Vista Service Pack 2 Direct3D 11.0 applications. -This code is designed to build with Visual Studio 2013 or 2015. It is recommended that you -make use of VS 2013 Update 5 or VS 2015 Update 3 and Windows 7 Service Pack 1 or later. +This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3, +or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools +1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10 +Creators Update SDK (15063). These components are designed to work without requiring any content from the DirectX SDK. For details, see "Where is the DirectX SDK?" . @@ -32,6 +34,7 @@ Inc\ Keyboard.h - keyboard state tracking helper Model.h - draws meshes loaded from .CMO, .SDKMESH, or .VBO files Mouse.h - mouse helper + PostProcess.h - set of built-in shaders for common post-processing operations PrimitiveBatch.h - simple and efficient way to draw user primitives ScreenGrab.h - light-weight screen shot saver SimpleMath.h - simplified C++ wrapper for DirectXMath @@ -79,6 +82,12 @@ https://opensource.microsoft.com/codeofconduct/ RELEASE HISTORY --------------- +June 21, 2017 + Post-processing support + SDKMESH loader fix when loading legacy files with all zero materials + DirectXTK for Audio: Minor fixes for environmental audio + Minor code cleanup + April 24, 2017 VS 2017 project updates Regenerated shaders using Windows 10 Creators Update SDK (15063) diff --git a/Kits/DirectXTK/Src/BasicPostProcess.cpp b/Kits/DirectXTK/Src/BasicPostProcess.cpp new file mode 100644 index 00000000..394cc588 --- /dev/null +++ b/Kits/DirectXTK/Src/BasicPostProcess.cpp @@ -0,0 +1,593 @@ +//-------------------------------------------------------------------------------------- +// File: BasicPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "ConstantBuffer.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int c_MaxSamples = 16; + + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct PostProcessConstants + { + XMVECTOR sampleOffsets[c_MaxSamples]; + XMVECTOR sampleWeights[c_MaxSamples]; + }; + + static_assert((sizeof(PostProcessConstants) % 16) == 0, "CB size not padded correctly"); + + // 2-parameter Gaussian distribution given standard deviation (rho) + inline float GaussianDistribution(float x, float y, float rho) + { + return expf(-(x * x + y * y) / (2 * rho * rho)) / sqrtf(2 * XM_PI * rho * rho); + } +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOnePostProcess_VSQuad.inc" + + #include "Shaders/Compiled/XboxOnePostProcess_PSCopy.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSMonochrome.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSSepia.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSDownScale2x2.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSDownScale4x4.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSGaussianBlur5x5.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomExtract.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomBlur.inc" +#else + #include "Shaders/Compiled/PostProcess_VSQuad.inc" + + #include "Shaders/Compiled/PostProcess_PSCopy.inc" + #include "Shaders/Compiled/PostProcess_PSMonochrome.inc" + #include "Shaders/Compiled/PostProcess_PSSepia.inc" + #include "Shaders/Compiled/PostProcess_PSDownScale2x2.inc" + #include "Shaders/Compiled/PostProcess_PSDownScale4x4.inc" + #include "Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc" + #include "Shaders/Compiled/PostProcess_PSBloomExtract.inc" + #include "Shaders/Compiled/PostProcess_PSBloomBlur.inc" +#endif +} + +namespace +{ + struct ShaderBytecode + { + void const* code; + size_t length; + }; + + const ShaderBytecode pixelShaders[] = + { + { PostProcess_PSCopy, sizeof(PostProcess_PSCopy) }, + { PostProcess_PSMonochrome, sizeof(PostProcess_PSMonochrome) }, + { PostProcess_PSSepia, sizeof(PostProcess_PSSepia) }, + { PostProcess_PSDownScale2x2, sizeof(PostProcess_PSDownScale2x2) }, + { PostProcess_PSDownScale4x4, sizeof(PostProcess_PSDownScale4x4) }, + { PostProcess_PSGaussianBlur5x5, sizeof(PostProcess_PSGaussianBlur5x5) }, + { PostProcess_PSBloomExtract, sizeof(PostProcess_PSBloomExtract) }, + { PostProcess_PSBloomBlur, sizeof(PostProcess_PSBloomBlur) }, + }; + + static_assert(_countof(pixelShaders) == BasicPostProcess::Effect_Max, "array/max mismatch"); + + // Factory for lazily instantiating shaders. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D11Device* device) + : mDevice(device), + stateObjects(device) + { } + + // Gets or lazily creates the vertex shader. + ID3D11VertexShader* GetVertexShader() + { + return DemandCreate(mVertexShader, mMutex, [&](ID3D11VertexShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreateVertexShader(PostProcess_VSQuad, sizeof(PostProcess_VSQuad), nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "BasicPostProcess"); + + return hr; + }); + } + + // Gets or lazily creates the specified pixel shader. + ID3D11PixelShader* GetPixelShader(int shaderIndex) + { + assert(shaderIndex >= 0 && shaderIndex < BasicPostProcess::Effect_Max); + _Analysis_assume_(shaderIndex >= 0 && shaderIndex < BasicPostProcess::Effect_Max); + + return DemandCreate(mPixelShaders[shaderIndex], mMutex, [&](ID3D11PixelShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreatePixelShader(pixelShaders[shaderIndex].code, pixelShaders[shaderIndex].length, nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "BasicPostProcess"); + + return hr; + }); + } + + CommonStates stateObjects; + + protected: + ComPtr mDevice; + ComPtr mVertexShader; + ComPtr mPixelShaders[BasicPostProcess::Effect_Max]; + std::mutex mMutex; + }; +} + +class BasicPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D11Device* device); + + void Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState); + + void SetConstants(bool value = true) { mUseConstants = value; mDirtyFlags = INT_MAX; } + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + // Fields. + BasicPostProcess::Effect fx; + PostProcessConstants constants; + ComPtr texture; + unsigned texWidth; + unsigned texHeight; + float guassianMultiplier; + float bloomSize; + float bloomBrightness; + float bloomThreshold; + bool bloomHorizontal; + +private: + bool mUseConstants; + int mDirtyFlags; + + void DownScale2x2(); + void DownScale4x4(); + void GaussianBlur5x5(float multiplier); + void Bloom(bool horizontal, float size, float brightness); + + ConstantBuffer mConstantBuffer; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device BasicPostProcess resources. +SharedResourcePool BasicPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +BasicPostProcess::Impl::Impl(_In_ ID3D11Device* device) + : mConstantBuffer(device), + mDeviceResources(deviceResourcesPool.DemandCreate(device)), + fx(BasicPostProcess::Copy), + texWidth(0), + texHeight(0), + guassianMultiplier(1.f), + bloomSize(1.f), + bloomBrightness(1.f), + bloomThreshold(0.25f), + bloomHorizontal(true), + mUseConstants(false), + mDirtyFlags(INT_MAX), + constants{} +{ + if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0) + { + throw std::exception("BasicPostProcess requires Feature Level 10.0 or later"); + } +} + + +// Sets our state onto the D3D device. +void BasicPostProcess::Impl::Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState) +{ + // Set the texture. + ID3D11ShaderResourceView* textures[1] = { texture.Get() }; + deviceContext->PSSetShaderResources(0, 1, textures); + + auto sampler = mDeviceResources->stateObjects.LinearClamp(); + deviceContext->PSSetSamplers(0, 1, &sampler); + + // Set state objects. + deviceContext->OMSetBlendState(mDeviceResources->stateObjects.Opaque(), nullptr, 0xffffffff); + deviceContext->OMSetDepthStencilState(mDeviceResources->stateObjects.DepthNone(), 0); + deviceContext->RSSetState(mDeviceResources->stateObjects.CullNone()); + + // Set shaders. + auto vertexShader = mDeviceResources->GetVertexShader(); + auto pixelShader = mDeviceResources->GetPixelShader(fx); + + deviceContext->VSSetShader(vertexShader, nullptr, 0); + deviceContext->PSSetShader(pixelShader, nullptr, 0); + + // Set constants. + if (mUseConstants) + { + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + switch (fx) + { + case DownScale_2x2: + DownScale2x2(); + break; + + case DownScale_4x4: + DownScale4x4(); + break; + + case GaussianBlur_5x5: + GaussianBlur5x5(guassianMultiplier); + break; + + case BloomExtract: + constants.sampleWeights[0] = XMVectorReplicate(bloomThreshold); + break; + + case BloomBlur: + Bloom(bloomHorizontal, bloomSize, bloomBrightness); + break; + } + } + +#if defined(_XBOX_ONE) && defined(_TITLE) + void *grfxMemory; + mConstantBuffer.SetData(deviceContext, constants, &grfxMemory); + + Microsoft::WRL::ComPtr deviceContextX; + ThrowIfFailed(deviceContext->QueryInterface(IID_GRAPHICS_PPV_ARGS(deviceContextX.GetAddressOf()))); + + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContextX->PSSetPlacementConstantBuffer(0, buffer, grfxMemory); +#else + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer.SetData(deviceContext, constants); + } + + // Set the constant buffer. + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContext->PSSetConstantBuffers(0, 1, &buffer); +#endif + } + + if (setCustomState) + { + setCustomState(); + } + + // Draw quad. + deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + + deviceContext->Draw(4, 0); +} + + +void BasicPostProcess::Impl::DownScale2x2() +{ + mUseConstants = true; + + if ( !texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + // Sample from the 4 surrounding points. Since the center point will be in the exact + // center of 4 texels, a 0.5f offset is needed to specify a texel center. + auto ptr = reinterpret_cast(constants.sampleOffsets); + for (int y = 0; y < 2; ++y) + { + for (int x = 0; x < 2; ++x) + { + ptr->x = (float(x) - 0.5f) * tu; + ptr->y = (float(y) - 0.5f) * tv; + ++ptr; + } + } + +} + + +void BasicPostProcess::Impl::DownScale4x4() +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + // Sample from the 16 surrounding points. Since the center point will be in the + // exact center of 16 texels, a 1.5f offset is needed to specify a texel center. + auto ptr = reinterpret_cast(constants.sampleOffsets); + for (int y = 0; y < 4; ++y) + { + for (int x = 0; x < 4; ++x) + { + ptr->x = (float(x) - 1.5f) * tu; + ptr->y = (float(y) - 1.5f) * tv; + ++ptr; + } + } + +} + + +void BasicPostProcess::Impl::GaussianBlur5x5(float multiplier) +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + float totalWeight = 0.0f; + size_t index = 0; + auto offsets = reinterpret_cast(constants.sampleOffsets); + auto weights = constants.sampleWeights; + for (int x = -2; x <= 2; ++x) + { + for (int y = -2; y <= 2; ++y) + { + // Exclude pixels with a block distance greater than 2. This will + // create a kernel which approximates a 5x5 kernel using only 13 + // sample points instead of 25; this is necessary since 2.0 shaders + // only support 16 texture grabs. + if (fabs(float(x)) + fabs(float(y)) > 2.0f) + continue; + + // Get the unscaled Gaussian intensity for this offset + offsets[index].x = float(x) * tu; + offsets[index].y = float(y) * tv; + offsets[index].z = 0.0f; + offsets[index].w = 0.0f; + + float g = GaussianDistribution(float(x), float(y), 1.0f); + weights[index] = XMVectorReplicate(g); + + totalWeight += XMVectorGetX(weights[index]); + + ++index; + } + } + + // Divide the current weight by the total weight of all the samples; Gaussian + // blur kernels add to 1.0f to ensure that the intensity of the image isn't + // changed when the blur occurs. An optional multiplier variable is used to + // add or remove image intensity during the blur. + for (size_t i = 0; i < index; ++i) + { + weights[i] /= totalWeight; + weights[i] *= multiplier; + } +} + + +void BasicPostProcess::Impl::Bloom(bool horizontal, float size, float brightness) +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 0.f; + float tv = 0.f; + if (horizontal) + { + tu = 1.f / float(texWidth); + } + else + { + tv = 1.f / float(texHeight); + } + + auto weights = reinterpret_cast(constants.sampleWeights); + auto offsets = reinterpret_cast(constants.sampleOffsets); + + // Fill the center texel + float weight = brightness * GaussianDistribution(0, 0, size); + weights[0] = XMFLOAT4(weight, weight, weight, 1.0f); + offsets[0].x = offsets[0].y = offsets[0].z = offsets[0].w = 0.f; + + // Fill the first half + for (int i = 1; i < 8; ++i) + { + // Get the Gaussian intensity for this offset + weight = brightness * GaussianDistribution(float(i), 0, size); + weights[i] = XMFLOAT4(weight, weight, weight, 1.0f); + offsets[i] = XMFLOAT4(float(i) * tu, float(i) * tv, 0.f, 0.f); + } + + // Mirror to the second half + for (int i = 8; i < 15; i++) + { + weights[i] = weights[i - 7]; + offsets[i] = XMFLOAT4(-offsets[i - 7].x, -offsets[i - 7].y, 0.f, 0.f); + } +} + + +// Public constructor. +BasicPostProcess::BasicPostProcess(_In_ ID3D11Device* device) + : pImpl(new Impl(device)) +{ +} + + +// Move constructor. +BasicPostProcess::BasicPostProcess(BasicPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +BasicPostProcess& BasicPostProcess::operator= (BasicPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +BasicPostProcess::~BasicPostProcess() +{ +} + + +// IPostProcess methods. +void BasicPostProcess::Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState) +{ + pImpl->Process(deviceContext, setCustomState); +} + + +// Shader control. +void BasicPostProcess::SetEffect(Effect fx) +{ + if (fx < 0 || fx >= Effect_Max) + throw std::out_of_range("Effect not defined"); + + pImpl->fx = fx; + + switch (fx) + { + case Copy: + case Monochrome: + case Sepia: + // These shaders don't use the constant buffer + pImpl->SetConstants(false); + break; + + default: + pImpl->SetConstants(true); + break; + } +} + + +// Properties +void BasicPostProcess::SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value) +{ + pImpl->texture = value; + + if (value) + { + ComPtr res; + value->GetResource(res.GetAddressOf()); + + D3D11_RESOURCE_DIMENSION resType = D3D11_RESOURCE_DIMENSION_UNKNOWN; + res->GetType(&resType); + + switch (resType) + { + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + ComPtr tex; + ThrowIfFailed(res.As(&tex)); + + D3D11_TEXTURE1D_DESC desc = {}; + tex->GetDesc(&desc); + pImpl->texWidth = desc.Width; + pImpl->texHeight = 1; + break; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + { + ComPtr tex; + ThrowIfFailed(res.As(&tex)); + + D3D11_TEXTURE2D_DESC desc = {}; + tex->GetDesc(&desc); + pImpl->texWidth = desc.Width; + pImpl->texHeight = desc.Height; + break; + } + + default: + throw std::exception("Unsupported texture type"); + } + } + else + { + pImpl->texWidth = pImpl->texHeight = 0; + } +} + + +void BasicPostProcess::SetGaussianParameter(float multiplier) +{ + pImpl->guassianMultiplier = multiplier; + pImpl->SetDirtyFlag(); +} + + +void BasicPostProcess::SetBloomExtractParameter(float threshold) +{ + pImpl->bloomThreshold = threshold; + pImpl->SetDirtyFlag(); +} + + +void BasicPostProcess::SetBloomBlurParameters(bool horizontal, float size, float brightness) +{ + pImpl->bloomSize = size; + pImpl->bloomBrightness = brightness; + pImpl->bloomHorizontal = horizontal; + pImpl->SetDirtyFlag(); +} \ No newline at end of file diff --git a/Kits/DirectXTK/Src/CommonStates.cpp b/Kits/DirectXTK/Src/CommonStates.cpp index 683c3fcd..e4182cb9 100644 --- a/Kits/DirectXTK/Src/CommonStates.cpp +++ b/Kits/DirectXTK/Src/CommonStates.cpp @@ -96,11 +96,11 @@ HRESULT CommonStates::Impl::CreateDepthStencilState(bool enable, bool writeEnabl { D3D11_DEPTH_STENCIL_DESC desc = {}; - desc.DepthEnable = enable; + desc.DepthEnable = enable ? TRUE : FALSE; desc.DepthWriteMask = writeEnable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO; desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL; - desc.StencilEnable = false; + desc.StencilEnable = FALSE; desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; @@ -127,8 +127,8 @@ HRESULT CommonStates::Impl::CreateRasterizerState(D3D11_CULL_MODE cullMode, D3D1 desc.CullMode = cullMode; desc.FillMode = fillMode; - desc.DepthClipEnable = true; - desc.MultisampleEnable = true; + desc.DepthClipEnable = TRUE; + desc.MultisampleEnable = TRUE; HRESULT hr = device->CreateRasterizerState(&desc, pResult); diff --git a/Kits/DirectXTK/Src/DualPostProcess.cpp b/Kits/DirectXTK/Src/DualPostProcess.cpp new file mode 100644 index 00000000..08e6795b --- /dev/null +++ b/Kits/DirectXTK/Src/DualPostProcess.cpp @@ -0,0 +1,337 @@ +//-------------------------------------------------------------------------------------- +// File: DualPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "ConstantBuffer.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int c_MaxSamples = 16; + + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct PostProcessConstants + { + XMVECTOR sampleOffsets[c_MaxSamples]; + XMVECTOR sampleWeights[c_MaxSamples]; + }; + + static_assert((sizeof(PostProcessConstants) % 16) == 0, "CB size not padded correctly"); +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOnePostProcess_VSQuad.inc" + + #include "Shaders/Compiled/XboxOnePostProcess_PSMerge.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomCombine.inc" +#else + #include "Shaders/Compiled/PostProcess_VSQuad.inc" + + #include "Shaders/Compiled/PostProcess_PSMerge.inc" + #include "Shaders/Compiled/PostProcess_PSBloomCombine.inc" +#endif +} + +namespace +{ + struct ShaderBytecode + { + void const* code; + size_t length; + }; + + const ShaderBytecode pixelShaders[] = + { + { PostProcess_PSMerge, sizeof(PostProcess_PSMerge) }, + { PostProcess_PSBloomCombine, sizeof(PostProcess_PSBloomCombine) }, + }; + + static_assert(_countof(pixelShaders) == DualPostProcess::Effect_Max, "array/max mismatch"); + + // Factory for lazily instantiating shaders. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D11Device* device) + : mDevice(device), + stateObjects(device) + { } + + // Gets or lazily creates the vertex shader. + ID3D11VertexShader* GetVertexShader() + { + return DemandCreate(mVertexShader, mMutex, [&](ID3D11VertexShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreateVertexShader(PostProcess_VSQuad, sizeof(PostProcess_VSQuad), nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "DualPostProcess"); + + return hr; + }); + } + + // Gets or lazily creates the specified pixel shader. + ID3D11PixelShader* GetPixelShader(int shaderIndex) + { + assert(shaderIndex >= 0 && shaderIndex < DualPostProcess::Effect_Max); + _Analysis_assume_(shaderIndex >= 0 && shaderIndex < DualPostProcess::Effect_Max); + + return DemandCreate(mPixelShaders[shaderIndex], mMutex, [&](ID3D11PixelShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreatePixelShader(pixelShaders[shaderIndex].code, pixelShaders[shaderIndex].length, nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "DualPostProcess"); + + return hr; + }); + } + + CommonStates stateObjects; + + protected: + ComPtr mDevice; + ComPtr mVertexShader; + ComPtr mPixelShaders[DualPostProcess::Effect_Max]; + std::mutex mMutex; + }; +} + +class DualPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D11Device* device); + + void Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState); + + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + // Fields. + DualPostProcess::Effect fx; + PostProcessConstants constants; + ComPtr texture; + ComPtr texture2; + float mergeWeight1; + float mergeWeight2; + float bloomIntensity; + float bloomBaseIntensity; + float bloomSaturation; + float bloomBaseSaturation; + +private: + int mDirtyFlags; + + ConstantBuffer mConstantBuffer; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device DualPostProcess resources. +SharedResourcePool DualPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +DualPostProcess::Impl::Impl(_In_ ID3D11Device* device) + : mConstantBuffer(device), + mDeviceResources(deviceResourcesPool.DemandCreate(device)), + fx(DualPostProcess::Merge), + mergeWeight1(0.5f), + mergeWeight2(0.5f), + bloomIntensity(1.25f), + bloomBaseIntensity(1.f), + bloomSaturation(1.f), + bloomBaseSaturation(1.f), + mDirtyFlags(INT_MAX), + constants{} +{ + if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0) + { + throw std::exception("DualPostProcess requires Feature Level 10.0 or later"); + } +} + + +// Sets our state onto the D3D device. +void DualPostProcess::Impl::Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState) +{ + // Set the texture. + ID3D11ShaderResourceView* textures[2] = { texture.Get(), texture2.Get() }; + deviceContext->PSSetShaderResources(0, 2, textures); + + auto sampler = mDeviceResources->stateObjects.LinearClamp(); + deviceContext->PSSetSamplers(0, 1, &sampler); + + // Set state objects. + deviceContext->OMSetBlendState(mDeviceResources->stateObjects.Opaque(), nullptr, 0xffffffff); + deviceContext->OMSetDepthStencilState(mDeviceResources->stateObjects.DepthNone(), 0); + deviceContext->RSSetState(mDeviceResources->stateObjects.CullNone()); + + // Set shaders. + auto vertexShader = mDeviceResources->GetVertexShader(); + auto pixelShader = mDeviceResources->GetPixelShader(fx); + + deviceContext->VSSetShader(vertexShader, nullptr, 0); + deviceContext->PSSetShader(pixelShader, nullptr, 0); + + // Set constants. + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + switch (fx) + { + case Merge: + constants.sampleWeights[0] = XMVectorReplicate(mergeWeight1); + constants.sampleWeights[1] = XMVectorReplicate(mergeWeight2); + break; + + case BloomCombine: + constants.sampleWeights[0] = XMVectorSet(bloomBaseSaturation, bloomSaturation, 0.f, 0.f); + constants.sampleWeights[1] = XMVectorReplicate(bloomBaseIntensity); + constants.sampleWeights[2] = XMVectorReplicate(bloomIntensity); + break; + } + } + +#if defined(_XBOX_ONE) && defined(_TITLE) + void *grfxMemory; + mConstantBuffer.SetData(deviceContext, constants, &grfxMemory); + + Microsoft::WRL::ComPtr deviceContextX; + ThrowIfFailed(deviceContext->QueryInterface(IID_GRAPHICS_PPV_ARGS(deviceContextX.GetAddressOf()))); + + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContextX->PSSetPlacementConstantBuffer(0, buffer, grfxMemory); +#else + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer.SetData(deviceContext, constants); + } + + // Set the constant buffer. + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContext->PSSetConstantBuffers(0, 1, &buffer); +#endif + + if (setCustomState) + { + setCustomState(); + } + + // Draw quad. + deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + + deviceContext->Draw(4, 0); +} + + +// Public constructor. +DualPostProcess::DualPostProcess(_In_ ID3D11Device* device) + : pImpl(new Impl(device)) +{ +} + + +// Move constructor. +DualPostProcess::DualPostProcess(DualPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +DualPostProcess& DualPostProcess::operator= (DualPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +DualPostProcess::~DualPostProcess() +{ +} + + +// IPostProcess methods. +void DualPostProcess::Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState) +{ + pImpl->Process(deviceContext, setCustomState); +} + + +// Shader control. +void DualPostProcess::SetEffect(Effect fx) +{ + if (fx < 0 || fx >= Effect_Max) + throw std::out_of_range("Effect not defined"); + + pImpl->fx = fx; + pImpl->SetDirtyFlag(); +} + + +// Properties +void DualPostProcess::SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value) +{ + pImpl->texture = value; +} + + +void DualPostProcess::SetSourceTexture2(_In_opt_ ID3D11ShaderResourceView* value) +{ + pImpl->texture2 = value; +} + + +void DualPostProcess::SetMergeParameters(float weight1, float weight2) +{ + pImpl->mergeWeight1 = weight1; + pImpl->mergeWeight2 = weight2; + pImpl->SetDirtyFlag(); +} + + +void DualPostProcess::SetBloomCombineParameters(float bloom, float base, float bloomSaturation, float baseSaturation) +{ + pImpl->bloomIntensity = bloom; + pImpl->bloomBaseIntensity = base; + pImpl->bloomSaturation = bloomSaturation; + pImpl->bloomBaseSaturation = baseSaturation; + pImpl->SetDirtyFlag(); +} diff --git a/Kits/DirectXTK/Src/GeometricPrimitive.cpp b/Kits/DirectXTK/Src/GeometricPrimitive.cpp index b93b5eb9..70df3c63 100644 --- a/Kits/DirectXTK/Src/GeometricPrimitive.cpp +++ b/Kits/DirectXTK/Src/GeometricPrimitive.cpp @@ -81,9 +81,9 @@ class GeometricPrimitive::Impl public: void Initialize(_In_ ID3D11DeviceContext* deviceContext, const VertexCollection& vertices, const IndexCollection& indices); - void XM_CALLCONV Draw(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection, FXMVECTOR color, _In_opt_ ID3D11ShaderResourceView* texture, bool wireframe, _In_opt_ std::function setCustomState) const; + void XM_CALLCONV Draw(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection, FXMVECTOR color, _In_opt_ ID3D11ShaderResourceView* texture, bool wireframe, std::function& setCustomState) const; - void Draw(_In_ IEffect* effect, _In_ ID3D11InputLayout* inputLayout, bool alpha, bool wireframe, _In_opt_ std::function setCustomState) const; + void Draw(_In_ IEffect* effect, _In_ ID3D11InputLayout* inputLayout, bool alpha, bool wireframe, std::function& setCustomState) const; void CreateInputLayout(_In_ IEffect* effect, _Outptr_ ID3D11InputLayout** inputLayout) const; @@ -209,7 +209,7 @@ void XM_CALLCONV GeometricPrimitive::Impl::Draw( FXMVECTOR color, ID3D11ShaderResourceView* texture, bool wireframe, - std::function setCustomState) const + std::function& setCustomState) const { assert(mResources != 0); auto effect = mResources->effect.get(); @@ -247,7 +247,7 @@ void GeometricPrimitive::Impl::Draw( ID3D11InputLayout* inputLayout, bool alpha, bool wireframe, - std::function setCustomState) const + std::function& setCustomState) const { assert(mResources != 0); auto deviceContext = mResources->deviceContext.Get(); diff --git a/Kits/DirectXTK/Src/ModelLoadSDKMESH.cpp b/Kits/DirectXTK/Src/ModelLoadSDKMESH.cpp index e4504340..06b24ece 100644 --- a/Kits/DirectXTK/Src/ModelLoadSDKMESH.cpp +++ b/Kits/DirectXTK/Src/ModelLoadSDKMESH.cpp @@ -87,21 +87,32 @@ namespace info.enableDualTexture = (flags & DUAL_TEXTURE) != 0; info.enableNormalMaps = (flags & NORMAL_MAPS) != 0; info.biasedVertexNormals = (flags & BIASED_VERTEX_NORMALS) != 0; - info.ambientColor = XMFLOAT3(mh.Ambient.x, mh.Ambient.y, mh.Ambient.z); - info.diffuseColor = XMFLOAT3(mh.Diffuse.x, mh.Diffuse.y, mh.Diffuse.z); - info.emissiveColor = XMFLOAT3(mh.Emissive.x, mh.Emissive.y, mh.Emissive.z); - if (mh.Diffuse.w != 1.f && mh.Diffuse.w != 0.f) + if (mh.Ambient.x == 0 && mh.Ambient.y == 0 && mh.Ambient.z == 0 && mh.Ambient.w == 0 + && mh.Diffuse.x == 0 && mh.Diffuse.y == 0 && mh.Diffuse.z == 0 && mh.Diffuse.w == 0) { - info.alpha = mh.Diffuse.w; + // SDKMESH material color block is uninitalized; assume defaults + info.diffuseColor = XMFLOAT3(1.f, 1.f, 1.f); + info.alpha = 1.f; } else - info.alpha = 1.f; - - if (mh.Power) { - info.specularPower = mh.Power; - info.specularColor = XMFLOAT3(mh.Specular.x, mh.Specular.y, mh.Specular.z); + info.ambientColor = XMFLOAT3(mh.Ambient.x, mh.Ambient.y, mh.Ambient.z); + info.diffuseColor = XMFLOAT3(mh.Diffuse.x, mh.Diffuse.y, mh.Diffuse.z); + info.emissiveColor = XMFLOAT3(mh.Emissive.x, mh.Emissive.y, mh.Emissive.z); + + if (mh.Diffuse.w != 1.f && mh.Diffuse.w != 0.f) + { + info.alpha = mh.Diffuse.w; + } + else + info.alpha = 1.f; + + if (mh.Power) + { + info.specularPower = mh.Power; + info.specularColor = XMFLOAT3(mh.Specular.x, mh.Specular.y, mh.Specular.z); + } } info.diffuseTexture = diffuseName; diff --git a/Kits/DirectXTK/Src/ScreenGrab.cpp b/Kits/DirectXTK/Src/ScreenGrab.cpp index 3829909a..88e7eb03 100644 --- a/Kits/DirectXTK/Src/ScreenGrab.cpp +++ b/Kits/DirectXTK/Src/ScreenGrab.cpp @@ -609,7 +609,7 @@ HRESULT DirectX::SaveWICTextureToFile( ID3D11DeviceContext* pContext, return E_UNEXPECTED; } - hr = FC->Initialize( source.Get(), targetGuid, WICBitmapDitherTypeNone, 0, 0, WICBitmapPaletteTypeCustom ); + hr = FC->Initialize( source.Get(), targetGuid, WICBitmapDitherTypeNone, nullptr, 0, WICBitmapPaletteTypeMedianCut ); if ( FAILED(hr) ) { pContext->Unmap( pStaging.Get(), 0 ); diff --git a/Kits/DirectXTK/Src/Shaders/CompileShaders.cmd b/Kits/DirectXTK/Src/Shaders/CompileShaders.cmd index 2c7b3402..50b22eff 100644 --- a/Kits/DirectXTK/Src/Shaders/CompileShaders.cmd +++ b/Kits/DirectXTK/Src/Shaders/CompileShaders.cmd @@ -173,6 +173,41 @@ call :CompileShaderHLSL%1 DGSLPhong ps mainTx call :CompileShaderHLSL%1 DGSLUnlit ps mainTxTk call :CompileShaderHLSL%1 DGSLLambert ps mainTxTk call :CompileShaderHLSL%1 DGSLPhong ps mainTxTk + +call :CompileShaderSM4%1 PostProcess vs VSQuad +call :CompileShaderSM4%1 PostProcess ps PSCopy +call :CompileShaderSM4%1 PostProcess ps PSMonochrome +call :CompileShaderSM4%1 PostProcess ps PSSepia +call :CompileShaderSM4%1 PostProcess ps PSDownScale2x2 +call :CompileShaderSM4%1 PostProcess ps PSDownScale4x4 +call :CompileShaderSM4%1 PostProcess ps PSGaussianBlur5x5 +call :CompileShaderSM4%1 PostProcess ps PSBloomExtract +call :CompileShaderSM4%1 PostProcess ps PSBloomBlur +call :CompileShaderSM4%1 PostProcess ps PSMerge +call :CompileShaderSM4%1 PostProcess ps PSBloomCombine + +call :CompileShaderSM4%1 ToneMap vs VSQuad +call :CompileShaderSM4%1 ToneMap ps PSCopy +call :CompileShaderSM4%1 ToneMap ps PSSaturate +call :CompileShaderSM4%1 ToneMap ps PSReinhard +call :CompileShaderSM4%1 ToneMap ps PSACESFilmic +call :CompileShaderSM4%1 ToneMap ps PS_SRGB +call :CompileShaderSM4%1 ToneMap ps PSSaturate_SRGB +call :CompileShaderSM4%1 ToneMap ps PSReinhard_SRGB +call :CompileShaderSM4%1 ToneMap ps PSACESFilmic_SRGB +call :CompileShaderSM4%1 ToneMap ps PSHDR10 + +if NOT %1.==xbox. goto skipxboxonly + +call :CompileShaderSM4xbox ToneMap ps PSHDR10_Saturate +call :CompileShaderSM4xbox ToneMap ps PSHDR10_Reinhard +call :CompileShaderSM4xbox ToneMap ps PSHDR10_ACESFilmic +call :CompileShaderSM4xbox ToneMap ps PSHDR10_Saturate_SRGB +call :CompileShaderSM4xbox ToneMap ps PSHDR10_Reinhard_SRGB +call :CompileShaderSM4xbox ToneMap ps PSHDR10_ACESFilmic_SRGB + +:skipxboxonly + echo. if %error% == 0 ( @@ -191,6 +226,13 @@ echo %fxc% %fxc% || set error=1 exit /b +:CompileShaderSM4 +set fxc=fxc /nologo %1.fx /T%2_4_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3 +echo. +echo %fxc% +%fxc% || set error=1 +exit /b + :CompileShaderHLSL set fxc=fxc /nologo %1.hlsl /T%2_4_0_level_9_1 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3 echo. @@ -199,6 +241,7 @@ echo %fxc% exit /b :CompileShaderxbox +:CompileShaderSM4xbox set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zpc /Zi /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3 echo. echo %fxc% diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc index bcebd469..31da7bb7 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc @@ -41,7 +41,7 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 115 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 115 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" texld r0, t2, s0 mad r1.w, r0.w, t0.w, -c0.x mul r0, r0, t0 // ::color<0,1,2,3> @@ -50,7 +50,7 @@ cmp r1, r1.x, c0.w, c0.z texkill r1 -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c1, r0.w, -r0 mad r0.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r0 // ::PSAlphaTestEqNe<0,1,2,3> @@ -81,10 +81,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestEqNe[] = { - 68, 88, 66, 67, 223, 222, - 22, 17, 155, 72, 223, 203, - 67, 118, 170, 136, 35, 43, - 102, 58, 1, 0, 0, 0, + 68, 88, 66, 67, 4, 162, + 13, 139, 204, 139, 237, 107, + 120, 146, 165, 30, 105, 221, + 97, 27, 1, 0, 0, 0, 16, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 180, 3, 0, 0, 116, 5, @@ -107,7 +107,7 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNe[] = 0, 0, 14, 0, 0, 0, 160, 0, 0, 0, 4, 0, 0, 0, 240, 1, 0, 0, - 16, 1, 0, 0, 67, 58, + 16, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -117,7 +117,7 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNe[] = 114, 115, 92, 65, 108, 112, 104, 97, 84, 101, 115, 116, 69, 102, 102, 101, 99, 116, - 46, 102, 120, 0, 67, 58, + 46, 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb index 48e5a75c..4accab8e 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc index 7e4c96c4..38995549 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc @@ -39,7 +39,7 @@ dcl t1.xy // pin<4,5> dcl_2d s0 -#line 128 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 128 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" texld r0, t1, s0 mad r1.w, r0.w, t0.w, -c0.x mul r0, r0, t0 // ::color<0,1,2,3> @@ -72,10 +72,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] = { - 68, 88, 66, 67, 69, 10, - 8, 89, 209, 110, 153, 46, - 125, 170, 203, 123, 91, 61, - 120, 74, 1, 0, 0, 0, + 68, 88, 66, 67, 52, 40, + 0, 181, 251, 126, 42, 165, + 196, 170, 19, 103, 67, 108, + 228, 56, 1, 0, 0, 0, 220, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 244, 2, 0, 0, 88, 4, @@ -98,7 +98,7 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] = 0, 0, 11, 0, 0, 0, 104, 0, 0, 0, 3, 0, 0, 0, 120, 1, 0, 0, - 192, 0, 0, 0, 67, 58, + 192, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb index 908b3c79..3812527f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc index 851d5a7c..d66b6e46 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc @@ -41,14 +41,14 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 91 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 91 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" texld r0, t2, s0 mad r1.w, r0.w, t0.w, -c0.x mul r0, r0, t0 // ::color<0,1,2,3> cmp r1, r1.w, c0.w, c0.z texkill r1 -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c1, r0.w, -r0 mad r0.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r0 // ::PSAlphaTestLtGt<0,1,2,3> @@ -78,10 +78,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestLtGt[] = { - 68, 88, 66, 67, 166, 96, - 218, 48, 105, 0, 80, 172, - 90, 208, 183, 116, 0, 11, - 224, 75, 1, 0, 0, 0, + 68, 88, 66, 67, 88, 214, + 60, 78, 4, 80, 104, 211, + 157, 39, 0, 174, 110, 64, + 49, 145, 1, 0, 0, 0, 180, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 136, 3, 0, 0, 24, 5, @@ -104,7 +104,7 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGt[] = 0, 0, 12, 0, 0, 0, 160, 0, 0, 0, 4, 0, 0, 0, 224, 1, 0, 0, - 0, 1, 0, 0, 67, 58, + 0, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -114,7 +114,7 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGt[] = 114, 115, 92, 65, 108, 112, 104, 97, 84, 101, 115, 116, 69, 102, 102, 101, 99, 116, - 46, 102, 120, 0, 67, 58, + 46, 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb index a06594a7..4810994c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc index 1aeae6c8..2b9a1459 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc @@ -39,7 +39,7 @@ dcl t1.xy // pin<4,5> dcl_2d s0 -#line 104 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 104 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" texld r0, t1, s0 mad r1.w, r0.w, t0.w, -c0.x mul r0, r0, t0 // ::color<0,1,2,3> @@ -69,10 +69,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] = { - 68, 88, 66, 67, 113, 163, - 254, 244, 67, 220, 177, 230, - 165, 222, 122, 35, 128, 204, - 108, 135, 1, 0, 0, 0, + 68, 88, 66, 67, 152, 76, + 217, 138, 186, 94, 113, 46, + 170, 245, 46, 36, 187, 253, + 169, 200, 1, 0, 0, 0, 128, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 2, 0, 0, 252, 3, @@ -95,7 +95,7 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] = 0, 0, 9, 0, 0, 0, 104, 0, 0, 0, 3, 0, 0, 0, 104, 1, 0, 0, - 176, 0, 0, 0, 67, 58, + 176, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb index 29f100f7..699b68bb 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc index c9891c0e..fcd23a2b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc @@ -43,7 +43,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSAlphaTest<12> #line 14 @@ -56,15 +56,15 @@ dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 31 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 31 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSAlphaTest<10,11> mov oPos.w, r0.z // ::VSAlphaTest<13> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSAlphaTest<0,1,2,3> mov oT1.xyz, c7.x // ::VSAlphaTest<4,5,6> -#line 38 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 38 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mov oT2.xy, v1 // ::VSAlphaTest<8,9> // approximately 12 instruction slots used @@ -90,10 +90,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTest[] = { - 68, 88, 66, 67, 18, 8, - 251, 190, 120, 232, 31, 50, - 201, 16, 250, 167, 213, 152, - 170, 105, 1, 0, 0, 0, + 68, 88, 66, 67, 165, 163, + 225, 78, 82, 212, 210, 87, + 151, 51, 73, 163, 130, 89, + 204, 12, 1, 0, 0, 0, 212, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 148, 4, 0, 0, 240, 5, @@ -118,7 +118,7 @@ const BYTE AlphaTestEffect_VSAlphaTest[] = 0, 0, 15, 0, 0, 0, 160, 0, 0, 0, 3, 0, 0, 0, 196, 2, 0, 0, - 24, 1, 0, 0, 67, 58, + 24, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -127,7 +127,7 @@ const BYTE AlphaTestEffect_VSAlphaTest[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb index 37e594b0..a27d83dc 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc index 3e47c05f..34b7b19a 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc @@ -41,20 +41,20 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSAlphaTestNoFog<8> dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 45 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 45 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSAlphaTestNoFog<6,7> mov oPos.w, r0.z // ::VSAlphaTestNoFog<9> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSAlphaTestNoFog<0,1,2,3> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mov oT1.xy, v1 // ::VSAlphaTestNoFog<4,5> // approximately 8 instruction slots used @@ -77,10 +77,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestNoFog[] = { - 68, 88, 66, 67, 3, 168, - 135, 208, 6, 246, 31, 6, - 123, 242, 87, 130, 26, 124, - 30, 206, 1, 0, 0, 0, + 68, 88, 66, 67, 17, 231, + 58, 227, 143, 44, 111, 7, + 194, 47, 134, 243, 82, 246, + 70, 18, 1, 0, 0, 0, 224, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 4, 4, 0, 0, 20, 5, @@ -105,7 +105,7 @@ const BYTE AlphaTestEffect_VSAlphaTestNoFog[] = 0, 0, 10, 0, 0, 0, 160, 0, 0, 0, 3, 0, 0, 0, 136, 2, 0, 0, - 240, 0, 0, 0, 67, 58, + 240, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -114,7 +114,7 @@ const BYTE AlphaTestEffect_VSAlphaTestNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb index 79a93080..f3e143b1 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc index 7f81a862..0cad27f7 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc @@ -45,7 +45,7 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7,8,9> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSAlphaTestVc<12> #line 14 @@ -53,22 +53,22 @@ max r0.x, r0.x, c7.x min oT1.w, r0.x, c7.y // ::VSAlphaTestVc<7> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mul oT0, v2, c1 // ::VSAlphaTestVc<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c3 // ::vout<0> dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSAlphaTestVc<10,11> mov oPos.w, r0.z // ::VSAlphaTestVc<13> -#line 51 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 51 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT1.xyz, c7.x // ::VSAlphaTestVc<4,5,6> -#line 66 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 66 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mov oT2.xy, v1 // ::VSAlphaTestVc<8,9> // approximately 12 instruction slots used @@ -95,10 +95,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestVc[] = { - 68, 88, 66, 67, 19, 218, - 128, 98, 220, 208, 190, 50, - 81, 139, 26, 86, 189, 60, - 95, 99, 1, 0, 0, 0, + 68, 88, 66, 67, 83, 112, + 156, 96, 160, 244, 179, 54, + 195, 23, 30, 43, 49, 36, + 179, 91, 1, 0, 0, 0, 56, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 4, 0, 0, 56, 6, @@ -123,7 +123,7 @@ const BYTE AlphaTestEffect_VSAlphaTestVc[] = 0, 0, 16, 0, 0, 0, 160, 0, 0, 0, 3, 0, 0, 0, 232, 2, 0, 0, - 32, 1, 0, 0, 67, 58, + 32, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -132,7 +132,7 @@ const BYTE AlphaTestEffect_VSAlphaTestVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb index 2970d105..4145c5e1 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc index 83187dad..595ab8b4 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc @@ -43,18 +43,18 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7,8,9> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSAlphaTestVcNoFog<8> -#line 82 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 82 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mul oT0, v2, c1 // ::VSAlphaTestVcNoFog<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 74 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" +#line 74 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\AlphaTestEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSAlphaTestVcNoFog<6,7> mov oPos.w, r0.z // ::VSAlphaTestVcNoFog<9> @@ -82,10 +82,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestVcNoFog[] = { - 68, 88, 66, 67, 22, 95, - 135, 27, 179, 87, 215, 174, - 126, 37, 202, 18, 25, 17, - 167, 48, 1, 0, 0, 0, + 68, 88, 66, 67, 48, 147, + 202, 173, 242, 175, 212, 27, + 43, 132, 220, 253, 13, 33, + 54, 89, 1, 0, 0, 0, 64, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 52, 4, 0, 0, 88, 5, @@ -110,7 +110,7 @@ const BYTE AlphaTestEffect_VSAlphaTestVcNoFog[] = 0, 0, 11, 0, 0, 0, 160, 0, 0, 0, 3, 0, 0, 0, 168, 2, 0, 0, - 248, 0, 0, 0, 67, 58, + 248, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -119,7 +119,7 @@ const BYTE AlphaTestEffect_VSAlphaTestVcNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb index ad42fe43..c0e832f3 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.inc index 023ee88e..e1a5f7e0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.inc @@ -31,7 +31,7 @@ dcl t0 // pin<0,1,2,3> dcl t1 // pin<4,5,6,7> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, c0, t0.w, -t0 mov r1.xyz, t0 // pin<0,1,2> mad r0.xyz, t1.w, r0, r1 // ApplyFog::color<0,1,2> @@ -54,10 +54,10 @@ ret const BYTE BasicEffect_PSBasic[] = { - 68, 88, 66, 67, 216, 21, - 8, 12, 227, 164, 236, 40, - 70, 156, 207, 108, 160, 232, - 87, 57, 1, 0, 0, 0, + 68, 88, 66, 67, 69, 188, + 57, 72, 167, 28, 156, 175, + 162, 21, 90, 51, 132, 77, + 151, 156, 1, 0, 0, 0, 180, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 132, 2, 0, 0, 56, 3, @@ -80,7 +80,7 @@ const BYTE BasicEffect_PSBasic[] = 0, 0, 96, 0, 0, 0, 3, 0, 0, 0, 68, 1, 0, 0, 152, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb index c0e44671..6fa007d5 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.inc index 539f3bea..3ba6bebc 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.inc @@ -22,7 +22,7 @@ ps_2_0 dcl t0 // pin<0,1,2,3> -#line 507 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 507 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oC0, t0 // ::PSBasicNoFog<0,1,2,3> // approximately 1 instruction slot used @@ -36,10 +36,10 @@ ret const BYTE BasicEffect_PSBasicNoFog[] = { - 68, 88, 66, 67, 223, 112, - 180, 160, 127, 27, 212, 153, - 83, 32, 5, 48, 221, 174, - 43, 173, 1, 0, 0, 0, + 68, 88, 66, 67, 30, 143, + 129, 169, 64, 67, 190, 94, + 187, 199, 124, 239, 138, 120, + 62, 127, 1, 0, 0, 0, 88, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 180, 1, 0, 0, 244, 1, @@ -60,7 +60,7 @@ const BYTE BasicEffect_PSBasicNoFog[] = 0, 0, 100, 0, 0, 0, 2, 0, 0, 0, 224, 0, 0, 0, 116, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb index 323f9fe1..78a9e977 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.inc index c314135a..9a877ffa 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.inc @@ -34,19 +34,19 @@ dcl t1.xyz // pin<4,5,6> dcl t2 // pin<7,8,9,10> -#line 580 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 580 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" add r0.xyz, -t0, c12 dp3 r0.w, r0, r0 rsq r0.w, r0.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r1.xyz, r0, r0.w, -c3 nrm r2.xyz, r1 // ::halfVectors<0,1,2> -#line 581 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 581 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" nrm r1.xyz, t1 // ::worldNormal<0,1,2> -#line 37 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 37 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r2, r1 // ::dotH<0> #line 33 @@ -88,17 +88,17 @@ mad r0.xyz, r0.z, c11, r2 mul r0.xyz, r0, c2 // ::result<3,4,5> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r0.xyz, r0, t2.w -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r2.xyz, r1.y, c7 mad r2.xyz, r1.x, c6, r2 mad r1.xyz, r1.z, c8, r2 mov r2.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r1.xyz, r1, r2, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, t2, r1, r0 // AddSpecular::color<0,1,2> #line 20 @@ -167,10 +167,10 @@ ret const BYTE BasicEffect_PSBasicPixelLighting[] = { - 68, 88, 66, 67, 141, 140, - 125, 64, 192, 147, 143, 10, - 191, 176, 246, 13, 36, 194, - 14, 208, 1, 0, 0, 0, + 68, 88, 66, 67, 50, 122, + 250, 178, 49, 244, 186, 238, + 1, 29, 124, 151, 142, 82, + 7, 95, 1, 0, 0, 0, 224, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 60, 9, 0, 0, 68, 15, @@ -193,7 +193,7 @@ const BYTE BasicEffect_PSBasicPixelLighting[] = 0, 0, 216, 0, 0, 0, 13, 0, 0, 0, 176, 4, 0, 0, 132, 2, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -202,7 +202,7 @@ const BYTE BasicEffect_PSBasicPixelLighting[] = 100, 101, 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -211,7 +211,7 @@ const BYTE BasicEffect_PSBasicPixelLighting[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb index 0bf2424c..1e8b942d 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc index 57b43437..21f38a34 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc @@ -44,20 +44,20 @@ dcl t3 // pin<9,10,11,12> dcl_2d s0 -#line 597 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 597 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" texld r0, t0, s0 add r1.xyz, -t1, c12 dp3 r1.w, r1, r1 rsq r1.w, r1.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r2.xyz, r1, r1.w, -c3 nrm r3.xyz, r2 // ::halfVectors<0,1,2> -#line 600 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 600 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" nrm r2.xyz, t2 // ::worldNormal<0,1,2> -#line 37 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 37 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, r3, r2 // ::dotH<0> #line 33 @@ -99,20 +99,20 @@ mad r1.xyz, r1.z, c11, r3 mul r1.xyz, r1, c2 // ::result<3,4,5> -#line 597 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 597 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul r0, r0, t3 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r1.xyz, r0.w, r1 -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r2.y, c7 mad r3.xyz, r2.x, c6, r3 mad r2.xyz, r2.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r2.xyz, r2, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, r0, r2, r1 // AddSpecular::color<0,1,2> #line 20 @@ -185,10 +185,10 @@ ret const BYTE BasicEffect_PSBasicPixelLightingTx[] = { - 68, 88, 66, 67, 236, 214, - 37, 133, 212, 64, 151, 171, - 153, 49, 244, 191, 25, 30, - 67, 224, 1, 0, 0, 0, + 68, 88, 66, 67, 69, 151, + 144, 63, 157, 131, 19, 208, + 101, 156, 202, 196, 129, 120, + 6, 93, 1, 0, 0, 0, 248, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 212, 9, 0, 0, 68, 16, @@ -211,7 +211,7 @@ const BYTE BasicEffect_PSBasicPixelLightingTx[] = 0, 0, 50, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 4, 5, 0, 0, - 156, 2, 0, 0, 67, 58, + 156, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -221,7 +221,7 @@ const BYTE BasicEffect_PSBasicPixelLightingTx[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -230,7 +230,7 @@ const BYTE BasicEffect_PSBasicPixelLightingTx[] = 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb index a7719f7e..18c6561f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc index daf4086d..3276008e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc @@ -41,11 +41,11 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 514 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 514 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" texld r0, t2, s0 mul r0, r0, t0 // ::color<0,1,2,3> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c0, r0.w, -r0 mad r0.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r0 // ::PSBasicTx<0,1,2,3> @@ -71,10 +71,10 @@ ret const BYTE BasicEffect_PSBasicTx[] = { - 68, 88, 66, 67, 195, 192, - 25, 247, 48, 1, 230, 124, - 129, 131, 229, 74, 96, 23, - 55, 139, 1, 0, 0, 0, + 68, 88, 66, 67, 123, 220, + 31, 234, 158, 102, 2, 242, + 110, 87, 153, 183, 89, 202, + 129, 64, 1, 0, 0, 0, 240, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 56, 3, 0, 0, 84, 4, @@ -97,7 +97,7 @@ const BYTE BasicEffect_PSBasicTx[] = 0, 0, 9, 0, 0, 0, 156, 0, 0, 0, 4, 0, 0, 0, 192, 1, 0, 0, - 228, 0, 0, 0, 67, 58, + 228, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -107,7 +107,7 @@ const BYTE BasicEffect_PSBasicTx[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb index 8213f758..80f5e4ae 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc index 56874d1a..7a438a01 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc @@ -32,7 +32,7 @@ dcl t1.xy // pin<4,5> dcl_2d s0 -#line 525 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 525 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" texld r0, t1, s0 mul r0, r0, t0 // ::PSBasicTxNoFog<0,1,2,3> mov oC0, r0 // ::PSBasicTxNoFog<0,1,2,3> @@ -53,10 +53,10 @@ ret const BYTE BasicEffect_PSBasicTxNoFog[] = { - 68, 88, 66, 67, 155, 103, - 253, 171, 169, 115, 201, 4, - 82, 215, 150, 31, 59, 26, - 191, 51, 1, 0, 0, 0, + 68, 88, 66, 67, 248, 60, + 215, 214, 126, 120, 68, 146, + 107, 190, 30, 87, 92, 248, + 95, 60, 1, 0, 0, 0, 108, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 76, 2, 0, 0, 232, 2, @@ -77,7 +77,7 @@ const BYTE BasicEffect_PSBasicTxNoFog[] = 0, 0, 6, 0, 0, 0, 100, 0, 0, 0, 2, 0, 0, 0, 60, 1, 0, 0, - 148, 0, 0, 0, 67, 58, + 148, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb index 56ab51d3..b2f2999b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.inc index f67f2e44..6a713b5b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.inc @@ -31,7 +31,7 @@ dcl t0 // pin<0,1,2,3> dcl t1 // pin<4,5,6,7> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov r0, t0 // pin<0,1,2,3> mad r0.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> @@ -58,10 +58,10 @@ ret const BYTE BasicEffect_PSBasicVertexLighting[] = { - 68, 88, 66, 67, 115, 167, - 123, 119, 225, 216, 206, 174, - 88, 76, 37, 145, 141, 201, - 81, 31, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 3, + 55, 171, 71, 136, 91, 30, + 179, 64, 22, 169, 76, 252, + 124, 134, 1, 0, 0, 0, 48, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 220, 2, 0, 0, 180, 3, @@ -84,7 +84,7 @@ const BYTE BasicEffect_PSBasicVertexLighting[] = 0, 0, 96, 0, 0, 0, 4, 0, 0, 0, 116, 1, 0, 0, 160, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb index 88ef624a..881062ec 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.inc index e596c252..ba30b73f 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.inc @@ -24,7 +24,7 @@ dcl t0 // pin<0,1,2,3> dcl t1 // pin<4,5,6,7> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov r0, t0 // pin<0,1,2,3> mad r0.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> mov r0.w, t0.w @@ -43,10 +43,10 @@ ret const BYTE BasicEffect_PSBasicVertexLightingNoFog[] = { - 68, 88, 66, 67, 197, 181, - 7, 34, 18, 19, 124, 69, - 191, 29, 39, 15, 166, 220, - 40, 155, 1, 0, 0, 0, + 68, 88, 66, 67, 196, 28, + 107, 98, 101, 144, 124, 111, + 77, 206, 157, 227, 35, 76, + 81, 60, 1, 0, 0, 0, 96, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 116, 2, 0, 0, 228, 2, @@ -67,7 +67,7 @@ const BYTE BasicEffect_PSBasicVertexLightingNoFog[] = 0, 0, 96, 0, 0, 0, 3, 0, 0, 0, 84, 1, 0, 0, 144, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb index 0f07f7d4..d4ae2f68 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc index de6104f7..180a7176 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc @@ -41,11 +41,11 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 555 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 555 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" texld r0, t2, s0 mul r0, r0, t0 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> #line 20 @@ -75,10 +75,10 @@ ret const BYTE BasicEffect_PSBasicVertexLightingTx[] = { - 68, 88, 66, 67, 91, 153, - 216, 138, 207, 60, 61, 161, - 93, 123, 189, 141, 228, 69, - 245, 158, 1, 0, 0, 0, + 68, 88, 66, 67, 66, 90, + 127, 18, 235, 157, 13, 199, + 73, 146, 42, 248, 177, 83, + 89, 116, 1, 0, 0, 0, 104, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 140, 3, 0, 0, 204, 4, @@ -101,7 +101,7 @@ const BYTE BasicEffect_PSBasicVertexLightingTx[] = 0, 0, 10, 0, 0, 0, 156, 0, 0, 0, 5, 0, 0, 0, 236, 1, 0, 0, - 236, 0, 0, 0, 67, 58, + 236, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -111,7 +111,7 @@ const BYTE BasicEffect_PSBasicVertexLightingTx[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb index a7de53bc..3eeb57b3 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc index 33eb8dc6..9e07bf21 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc @@ -34,11 +34,11 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 567 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 567 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" texld r0, t2, s0 mul r0, r0, t0 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> mov oC0, r0 // ::PSBasicVertexLightingTxNoFog<0,1,2,3> @@ -61,10 +61,10 @@ ret const BYTE BasicEffect_PSBasicVertexLightingTxNoFog[] = { - 68, 88, 66, 67, 7, 119, - 34, 7, 128, 21, 24, 58, - 103, 133, 135, 101, 19, 170, - 223, 209, 1, 0, 0, 0, + 68, 88, 66, 67, 79, 101, + 43, 162, 69, 17, 211, 12, + 23, 254, 155, 16, 49, 234, + 194, 4, 1, 0, 0, 0, 164, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 40, 3, 0, 0, 8, 4, @@ -85,7 +85,7 @@ const BYTE BasicEffect_PSBasicVertexLightingTxNoFog[] = 0, 0, 8, 0, 0, 0, 156, 0, 0, 0, 4, 0, 0, 0, 208, 1, 0, 0, - 220, 0, 0, 0, 67, 58, + 220, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -95,7 +95,7 @@ const BYTE BasicEffect_PSBasicVertexLightingTxNoFog[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb index 9b6f0dfd..b75d1a8a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.inc index da38ee3c..57d134c8 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.inc @@ -41,7 +41,7 @@ def c7, 0, 1, 0, 0 dcl_texcoord v0 // vin<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSBasic<10> #line 14 @@ -54,11 +54,11 @@ dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 44 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 44 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasic<8,9> mov oPos.w, r0.z // ::VSBasic<11> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSBasic<0,1,2,3> mov oT1.xyz, c7.x // ::VSBasic<4,5,6> @@ -82,10 +82,10 @@ ret const BYTE BasicEffect_VSBasic[] = { - 68, 88, 66, 67, 240, 206, - 210, 175, 28, 200, 58, 208, - 72, 62, 130, 39, 175, 196, - 181, 185, 1, 0, 0, 0, + 68, 88, 66, 67, 236, 9, + 48, 202, 175, 84, 103, 251, + 9, 56, 206, 63, 215, 90, + 45, 174, 1, 0, 0, 0, 252, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 44, 4, 0, 0, 92, 5, @@ -112,7 +112,7 @@ const BYTE BasicEffect_VSBasic[] = 0, 0, 13, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 104, 2, 0, 0, - 4, 1, 0, 0, 67, 58, + 4, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -121,7 +121,7 @@ const BYTE BasicEffect_VSBasic[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb index b31dc05e..ba5dcac6 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.inc index 08b27c8f..82a91592 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.inc @@ -38,17 +38,17 @@ vs_2_0 dcl_texcoord v0 // vin<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSBasicNoFog<6> dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicNoFog<4,5> mov oPos.w, r0.z // ::VSBasicNoFog<7> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSBasicNoFog<0,1,2,3> // approximately 7 instruction slots used @@ -68,10 +68,10 @@ ret const BYTE BasicEffect_VSBasicNoFog[] = { - 68, 88, 66, 67, 73, 82, - 58, 206, 202, 214, 104, 127, - 12, 118, 240, 252, 36, 236, - 215, 172, 1, 0, 0, 0, + 68, 88, 66, 67, 192, 213, + 36, 185, 113, 26, 128, 104, + 70, 236, 179, 37, 122, 5, + 165, 47, 1, 0, 0, 0, 252, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 144, 3, 0, 0, 116, 4, @@ -96,7 +96,7 @@ const BYTE BasicEffect_VSBasicNoFog[] = 0, 0, 8, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 44, 2, 0, 0, - 220, 0, 0, 0, 67, 58, + 220, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -105,7 +105,7 @@ const BYTE BasicEffect_VSBasicNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb index e0d1c758..ac6b647c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.inc index c06dbe4f..f280fd3d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.inc @@ -46,7 +46,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, v1, c12 dp3 r0.y, v1, c13 dp3 r0.z, v1, c14 @@ -91,21 +91,21 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLight<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.x min oT1.w, r0.x, c19.y // ::VSBasicOneLight<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 264 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 264 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLight<8,9> mov oPos.w, r0.z // ::VSBasicOneLight<11> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicOneLight<3> // approximately 42 instruction slots used @@ -160,10 +160,10 @@ ret const BYTE BasicEffect_VSBasicOneLight[] = { - 68, 88, 66, 67, 254, 167, - 194, 44, 136, 45, 223, 177, - 134, 3, 91, 249, 97, 92, - 103, 14, 1, 0, 0, 0, + 68, 88, 66, 67, 200, 96, + 34, 33, 65, 204, 128, 126, + 24, 219, 245, 159, 51, 215, + 34, 124, 1, 0, 0, 0, 76, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 212, 8, 0, 0, 140, 13, @@ -196,7 +196,7 @@ const BYTE BasicEffect_VSBasicOneLight[] = 0, 0, 37, 0, 0, 0, 216, 0, 0, 0, 13, 0, 0, 0, 176, 4, 0, 0, - 52, 2, 0, 0, 67, 58, + 52, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -205,7 +205,7 @@ const BYTE BasicEffect_VSBasicOneLight[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -214,7 +214,7 @@ const BYTE BasicEffect_VSBasicOneLight[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.pdb index 18133ed9..830cfb55 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLight.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.inc index c60e2c08..657adee9 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.inc @@ -46,10 +46,10 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c19.x, c19.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c12 dp3 r1.y, r0, c13 dp3 r1.z, r0, c14 @@ -94,21 +94,21 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightBn<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.z min oT1.w, r0.x, c19.w // ::VSBasicOneLightBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 274 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 274 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightBn<8,9> mov oPos.w, r0.z // ::VSBasicOneLightBn<11> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicOneLightBn<3> // approximately 43 instruction slots used @@ -164,10 +164,10 @@ ret const BYTE BasicEffect_VSBasicOneLightBn[] = { - 68, 88, 66, 67, 101, 52, - 217, 221, 14, 101, 33, 48, - 76, 129, 198, 95, 198, 31, - 73, 45, 1, 0, 0, 0, + 68, 88, 66, 67, 21, 248, + 61, 196, 14, 138, 155, 15, + 78, 154, 196, 76, 139, 28, + 200, 103, 1, 0, 0, 0, 224, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 44, 9, 0, 0, 32, 14, @@ -200,7 +200,7 @@ const BYTE BasicEffect_VSBasicOneLightBn[] = 0, 0, 38, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 224, 4, 0, 0, - 96, 2, 0, 0, 67, 58, + 96, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -209,7 +209,7 @@ const BYTE BasicEffect_VSBasicOneLightBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -218,7 +218,7 @@ const BYTE BasicEffect_VSBasicOneLightBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.pdb index 20de1dae..f3d11bf1 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.inc index caeccf94..31db387f 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.inc @@ -49,7 +49,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, v1, c12 dp3 r0.y, v1, c13 dp3 r0.z, v1, c14 @@ -94,24 +94,24 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightTx<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.x min oT1.w, r0.x, c19.y // ::VSBasicOneLightTx<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 316 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 316 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightTx<10,11> mov oPos.w, r0.z // ::VSBasicOneLightTx<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicOneLightTx<3> -#line 323 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 323 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v2 // ::VSBasicOneLightTx<8,9> // approximately 43 instruction slots used @@ -169,10 +169,10 @@ ret const BYTE BasicEffect_VSBasicOneLightTx[] = { - 68, 88, 66, 67, 49, 54, - 194, 25, 229, 35, 139, 117, - 76, 77, 75, 184, 150, 103, - 168, 247, 1, 0, 0, 0, + 68, 88, 66, 67, 85, 219, + 172, 49, 44, 48, 148, 158, + 27, 163, 197, 130, 66, 94, + 73, 0, 1, 0, 0, 0, 40, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 68, 9, 0, 0, 40, 14, @@ -205,7 +205,7 @@ const BYTE BasicEffect_VSBasicOneLightTx[] = 0, 0, 39, 0, 0, 0, 216, 0, 0, 0, 13, 0, 0, 0, 8, 5, 0, 0, - 68, 2, 0, 0, 67, 58, + 68, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -214,7 +214,7 @@ const BYTE BasicEffect_VSBasicOneLightTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -223,7 +223,7 @@ const BYTE BasicEffect_VSBasicOneLightTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.pdb index 5912894c..4baba64b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.inc index 64acaff5..49148d29 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.inc @@ -49,10 +49,10 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c19.x, c19.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c12 dp3 r1.y, r0, c13 dp3 r1.z, r0, c14 @@ -97,24 +97,24 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightTxBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.z min oT1.w, r0.x, c19.w // ::VSBasicOneLightTxBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 328 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 328 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightTxBn<10,11> mov oPos.w, r0.z // ::VSBasicOneLightTxBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicOneLightTxBn<3> -#line 337 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 337 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v2 // ::VSBasicOneLightTxBn<8,9> // approximately 44 instruction slots used @@ -173,10 +173,10 @@ ret const BYTE BasicEffect_VSBasicOneLightTxBn[] = { - 68, 88, 66, 67, 241, 78, - 109, 128, 110, 42, 61, 129, - 175, 149, 215, 234, 35, 131, - 59, 42, 1, 0, 0, 0, + 68, 88, 66, 67, 60, 91, + 132, 27, 5, 144, 168, 201, + 142, 131, 65, 174, 36, 227, + 233, 8, 1, 0, 0, 0, 184, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 9, 0, 0, 184, 14, @@ -209,7 +209,7 @@ const BYTE BasicEffect_VSBasicOneLightTxBn[] = 0, 0, 40, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 52, 5, 0, 0, - 112, 2, 0, 0, 67, 58, + 112, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -218,7 +218,7 @@ const BYTE BasicEffect_VSBasicOneLightTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -227,7 +227,7 @@ const BYTE BasicEffect_VSBasicOneLightTxBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.pdb index 9fa4b39e..635b5782 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.inc index f65e7191..d1a58390 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.inc @@ -51,7 +51,7 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::pos_ws<0> dp4 r0.y, v0, c10 // ::pos_ws<1> dp4 r0.z, v0, c11 // ::pos_ws<2> @@ -87,10 +87,10 @@ mov r2.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r1.xyz, r1, r2, c2 // ::result<0,1,2> -#line 352 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 352 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r1, v3 // ::VSBasicOneLightTxVc<0,1,2> -#line 42 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 42 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" pow r1.x, r0.x, c3.w mul r0.x, r0.y, r1.x // ::specular<0> @@ -101,20 +101,20 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightTxVc<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.x min oT1.w, r0.x, c19.y // ::VSBasicOneLightTxVc<7> -#line 352 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 352 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.w, v3.w, c1.w // ::VSBasicOneLightTxVc<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 344 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 344 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightTxVc<10,11> mov oPos.w, r0.z // ::VSBasicOneLightTxVc<13> @@ -178,10 +178,10 @@ ret const BYTE BasicEffect_VSBasicOneLightTxVc[] = { - 68, 88, 66, 67, 162, 110, - 142, 238, 197, 42, 66, 194, - 193, 145, 66, 190, 155, 180, - 198, 1, 1, 0, 0, 0, + 68, 88, 66, 67, 45, 22, + 62, 241, 29, 93, 197, 94, + 33, 234, 31, 216, 67, 252, + 141, 188, 1, 0, 0, 0, 12, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 216, 9, 0, 0, 236, 14, @@ -214,7 +214,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVc[] = 0, 0, 41, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 104, 5, 0, 0, - 84, 2, 0, 0, 67, 58, + 84, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -223,7 +223,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -233,7 +233,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVc[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.pdb index 61902e7e..1c349fe3 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.inc index 6ccabd55..b59b46e0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.inc @@ -51,7 +51,7 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::pos_ws<0> dp4 r0.y, v0, c10 // ::pos_ws<1> dp4 r0.z, v0, c11 // ::pos_ws<2> @@ -62,10 +62,10 @@ add r0.xyz, r1, -c4 nrm r1.xyz, r0 // ::halfVectors<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c19.x, c19.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r0, c12 dp3 r2.y, r0, c13 dp3 r2.z, r0, c14 @@ -90,10 +90,10 @@ mov r2.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r1.xyz, r1, r2, c2 // ::result<0,1,2> -#line 367 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 367 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r1, v3 // ::VSBasicOneLightTxVcBn<0,1,2> -#line 42 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 42 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" pow r1.x, r0.y, c3.w mul r0.x, r0.x, r1.x // ::specular<0> @@ -104,20 +104,20 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightTxVcBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.z min oT1.w, r0.x, c19.w // ::VSBasicOneLightTxVcBn<7> -#line 367 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 367 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.w, v3.w, c1.w // ::VSBasicOneLightTxVcBn<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 357 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 357 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightTxVcBn<10,11> mov oPos.w, r0.z // ::VSBasicOneLightTxVcBn<13> @@ -182,10 +182,10 @@ ret const BYTE BasicEffect_VSBasicOneLightTxVcBn[] = { - 68, 88, 66, 67, 157, 92, - 32, 56, 164, 226, 39, 56, - 14, 65, 240, 232, 44, 189, - 198, 125, 1, 0, 0, 0, + 68, 88, 66, 67, 83, 200, + 193, 224, 116, 67, 233, 210, + 57, 33, 131, 113, 69, 122, + 162, 140, 1, 0, 0, 0, 160, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 48, 10, 0, 0, 128, 15, @@ -218,7 +218,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVcBn[] = 0, 0, 42, 0, 0, 0, 216, 0, 0, 0, 15, 0, 0, 0, 152, 5, 0, 0, - 128, 2, 0, 0, 67, 58, + 128, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -227,7 +227,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -236,7 +236,7 @@ const BYTE BasicEffect_VSBasicOneLightTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.pdb index 7d8e9020..b31795af 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightTxVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.inc index 21d0f2a7..3dd60e30 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.inc @@ -48,7 +48,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::pos_ws<0> dp4 r0.y, v0, c10 // ::pos_ws<1> dp4 r0.z, v0, c11 // ::pos_ws<2> @@ -84,10 +84,10 @@ mov r2.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r1.xyz, r1, r2, c2 // ::result<0,1,2> -#line 295 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 295 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r1, v2 // ::VSBasicOneLightVc<0,1,2> -#line 42 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 42 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" pow r1.x, r0.x, c3.w mul r0.x, r0.y, r1.x // ::specular<0> @@ -98,20 +98,20 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightVc<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.x min oT1.w, r0.x, c19.y // ::VSBasicOneLightVc<7> -#line 295 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 295 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.w, v2.w, c1.w // ::VSBasicOneLightVc<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 288 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 288 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightVc<8,9> mov oPos.w, r0.z // ::VSBasicOneLightVc<11> @@ -169,10 +169,10 @@ ret const BYTE BasicEffect_VSBasicOneLightVc[] = { - 68, 88, 66, 67, 61, 157, - 37, 174, 188, 135, 93, 132, - 68, 95, 151, 35, 179, 191, - 225, 135, 1, 0, 0, 0, + 68, 88, 66, 67, 178, 181, + 24, 148, 228, 174, 240, 114, + 226, 20, 186, 240, 154, 185, + 120, 75, 1, 0, 0, 0, 52, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 108, 9, 0, 0, 84, 14, @@ -205,7 +205,7 @@ const BYTE BasicEffect_VSBasicOneLightVc[] = 0, 0, 39, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 20, 5, 0, 0, - 68, 2, 0, 0, 67, 58, + 68, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -214,7 +214,7 @@ const BYTE BasicEffect_VSBasicOneLightVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -224,7 +224,7 @@ const BYTE BasicEffect_VSBasicOneLightVc[] = 114, 115, 92, 66, 97, 115, 105, 99, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.pdb index b12c69cd..21e830e4 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.inc index 70400487..ff4e3630 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.inc @@ -48,7 +48,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::pos_ws<0> dp4 r0.y, v0, c10 // ::pos_ws<1> dp4 r0.z, v0, c11 // ::pos_ws<2> @@ -59,10 +59,10 @@ add r0.xyz, r1, -c4 nrm r1.xyz, r0 // ::halfVectors<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c19.x, c19.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r0, c12 dp3 r2.y, r0, c13 dp3 r2.z, r0, c14 @@ -87,10 +87,10 @@ mov r2.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r1.xyz, r1, r2, c2 // ::result<0,1,2> -#line 309 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 309 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r1, v2 // ::VSBasicOneLightVcBn<0,1,2> -#line 42 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 42 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" pow r1.x, r0.y, c3.w mul r0.x, r0.x, r1.x // ::specular<0> @@ -101,20 +101,20 @@ #line 63 dp4 oPos.z, v0, c17 // ::VSBasicOneLightVcBn<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c8 max r0.x, r0.x, c19.z min oT1.w, r0.x, c19.w // ::VSBasicOneLightVcBn<7> -#line 309 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 309 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.w, v2.w, c1.w // ::VSBasicOneLightVcBn<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::vout<0> dp4 r0.y, v0, c16 // ::vout<1> dp4 r0.z, v0, c18 // ::vout<3> -#line 300 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 300 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicOneLightVcBn<8,9> mov oPos.w, r0.z // ::VSBasicOneLightVcBn<11> @@ -173,10 +173,10 @@ ret const BYTE BasicEffect_VSBasicOneLightVcBn[] = { - 68, 88, 66, 67, 61, 59, - 251, 81, 112, 5, 173, 182, - 201, 128, 210, 37, 175, 173, - 74, 233, 1, 0, 0, 0, + 68, 88, 66, 67, 241, 18, + 67, 41, 45, 46, 148, 237, + 196, 118, 59, 235, 68, 171, + 71, 126, 1, 0, 0, 0, 196, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 192, 9, 0, 0, 228, 14, @@ -209,7 +209,7 @@ const BYTE BasicEffect_VSBasicOneLightVcBn[] = 0, 0, 40, 0, 0, 0, 216, 0, 0, 0, 15, 0, 0, 0, 64, 5, 0, 0, - 112, 2, 0, 0, 67, 58, + 112, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -218,7 +218,7 @@ const BYTE BasicEffect_VSBasicOneLightVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -227,7 +227,7 @@ const BYTE BasicEffect_VSBasicOneLightVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.pdb index b7cd17e2..bc290b02 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicOneLightVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.inc index 8b55074f..c93dced9 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.inc @@ -44,7 +44,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLighting<13> dp4 oT0.x, v0, c3 // ::VSBasicPixelLighting<0> dp4 oT0.y, v0, c4 // ::VSBasicPixelLighting<1> @@ -56,17 +56,17 @@ rsq r0.w, r0.w mul oT1.xyz, r0.w, r0 // ::VSBasicPixelLighting<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT0.w, r0.x, c13.y // ::VSBasicPixelLighting<3> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 374 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 374 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLighting<11,12> mov oPos.w, r0.z // ::VSBasicPixelLighting<14> @@ -106,10 +106,10 @@ ret const BYTE BasicEffect_VSBasicPixelLighting[] = { - 68, 88, 66, 67, 179, 161, - 70, 135, 103, 197, 113, 49, - 193, 146, 133, 66, 3, 92, - 31, 182, 1, 0, 0, 0, + 68, 88, 66, 67, 127, 31, + 132, 49, 142, 141, 111, 187, + 187, 23, 32, 165, 85, 185, + 200, 188, 1, 0, 0, 0, 4, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 5, 0, 0, 36, 8, @@ -136,7 +136,7 @@ const BYTE BasicEffect_VSBasicPixelLighting[] = 0, 0, 23, 0, 0, 0, 216, 0, 0, 0, 3, 0, 0, 0, 100, 3, 0, 0, - 144, 1, 0, 0, 67, 58, + 144, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -145,7 +145,7 @@ const BYTE BasicEffect_VSBasicPixelLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -154,7 +154,7 @@ const BYTE BasicEffect_VSBasicPixelLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb index 89d47eaf..c8171a5d 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.inc index d79731b4..1c49cac0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.inc @@ -44,16 +44,16 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingBn<13> dp4 oT0.x, v0, c3 // ::VSBasicPixelLightingBn<0> dp4 oT0.y, v0, c4 // ::VSBasicPixelLightingBn<1> dp4 oT0.z, v0, c5 // ::VSBasicPixelLightingBn<2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -61,17 +61,17 @@ rsq r0.x, r0.x mul oT1.xyz, r0.x, r1 // ::VSBasicPixelLightingBn<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT0.w, r0.x, c13.w // ::VSBasicPixelLightingBn<3> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 386 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 386 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingBn<11,12> mov oPos.w, r0.z // ::VSBasicPixelLightingBn<14> @@ -112,10 +112,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingBn[] = { - 68, 88, 66, 67, 190, 91, - 114, 136, 160, 114, 35, 79, - 232, 61, 197, 212, 169, 88, - 216, 59, 1, 0, 0, 0, + 68, 88, 66, 67, 140, 200, + 9, 221, 217, 67, 28, 191, + 64, 105, 72, 92, 198, 77, + 235, 155, 1, 0, 0, 0, 152, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 32, 6, 0, 0, 184, 8, @@ -142,7 +142,7 @@ const BYTE BasicEffect_VSBasicPixelLightingBn[] = 0, 0, 24, 0, 0, 0, 216, 0, 0, 0, 4, 0, 0, 0, 148, 3, 0, 0, - 188, 1, 0, 0, 67, 58, + 188, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -151,7 +151,7 @@ const BYTE BasicEffect_VSBasicPixelLightingBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -160,7 +160,7 @@ const BYTE BasicEffect_VSBasicPixelLightingBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb index 1eeab089..b17a1847 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc index be26daa8..7d67c2c4 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc @@ -47,7 +47,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingTx<15> dp4 oT1.x, v0, c3 // ::VSBasicPixelLightingTx<2> dp4 oT1.y, v0, c4 // ::VSBasicPixelLightingTx<3> @@ -59,17 +59,17 @@ rsq r0.w, r0.w mul oT2.xyz, r0.w, r0 // ::VSBasicPixelLightingTx<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT1.w, r0.x, c13.y // ::VSBasicPixelLightingTx<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 432 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 432 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingTx<13,14> mov oPos.w, r0.z // ::VSBasicPixelLightingTx<16> @@ -113,10 +113,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTx[] = { - 68, 88, 66, 67, 127, 232, - 134, 92, 11, 55, 131, 88, - 39, 17, 74, 253, 244, 25, - 57, 66, 1, 0, 0, 0, + 68, 88, 66, 67, 237, 182, + 133, 251, 223, 164, 239, 16, + 163, 168, 38, 59, 51, 232, + 215, 10, 1, 0, 0, 0, 212, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 52, 6, 0, 0, 188, 8, @@ -143,7 +143,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTx[] = 0, 0, 25, 0, 0, 0, 216, 0, 0, 0, 3, 0, 0, 0, 184, 3, 0, 0, - 160, 1, 0, 0, 67, 58, + 160, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -152,7 +152,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -161,7 +161,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb index 539e8234..fb2c46f4 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc index 883e5040..019edc06 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc @@ -47,16 +47,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingTxBn<15> dp4 oT1.x, v0, c3 // ::VSBasicPixelLightingTxBn<2> dp4 oT1.y, v0, c4 // ::VSBasicPixelLightingTxBn<3> dp4 oT1.z, v0, c5 // ::VSBasicPixelLightingTxBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -64,17 +64,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r1 // ::VSBasicPixelLightingTxBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT1.w, r0.x, c13.w // ::VSBasicPixelLightingTxBn<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 445 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 445 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingTxBn<13,14> mov oPos.w, r0.z // ::VSBasicPixelLightingTxBn<16> @@ -119,10 +119,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = { - 68, 88, 66, 67, 77, 232, - 89, 238, 103, 115, 141, 213, - 60, 168, 52, 57, 37, 9, - 15, 243, 1, 0, 0, 0, + 68, 88, 66, 67, 169, 66, + 159, 79, 73, 35, 120, 89, + 125, 235, 221, 238, 33, 1, + 87, 44, 1, 0, 0, 0, 104, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 140, 6, 0, 0, 80, 9, @@ -149,7 +149,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = 0, 0, 26, 0, 0, 0, 216, 0, 0, 0, 4, 0, 0, 0, 232, 3, 0, 0, - 204, 1, 0, 0, 67, 58, + 204, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -158,7 +158,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -167,7 +167,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb index 640f4663..fb02bd8b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc index 8e49d8cc..ef109765 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc @@ -49,7 +49,7 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingTxVc<15> dp4 oT1.x, v0, c3 // ::VSBasicPixelLightingTxVc<2> dp4 oT1.y, v0, c4 // ::VSBasicPixelLightingTxVc<3> @@ -61,20 +61,20 @@ rsq r0.w, r0.w mul oT2.xyz, r0.w, r0 // ::VSBasicPixelLightingTxVc<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT1.w, r0.x, c13.y // ::VSBasicPixelLightingTxVc<5> -#line 470 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 470 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT3.w, v3.w, c1.w // ::VSBasicPixelLightingTxVc<12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 462 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 462 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingTxVc<13,14> mov oPos.w, r0.z // ::VSBasicPixelLightingTxVc<16> @@ -118,10 +118,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = { - 68, 88, 66, 67, 245, 156, - 169, 222, 154, 156, 68, 113, - 247, 120, 33, 100, 44, 135, - 0, 237, 1, 0, 0, 0, + 68, 88, 66, 67, 16, 220, + 12, 15, 228, 140, 248, 149, + 69, 83, 17, 3, 59, 138, + 181, 144, 1, 0, 0, 0, 56, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 112, 6, 0, 0, 0, 9, @@ -148,7 +148,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = 0, 0, 26, 0, 0, 0, 216, 0, 0, 0, 3, 0, 0, 0, 236, 3, 0, 0, - 168, 1, 0, 0, 67, 58, + 168, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -157,7 +157,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -166,7 +166,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb index 0895d58f..9b3a39e6 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc index 6973fd59..b81135ea 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc @@ -49,16 +49,16 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingTxVcBn<15> dp4 oT1.x, v0, c3 // ::VSBasicPixelLightingTxVcBn<2> dp4 oT1.y, v0, c4 // ::VSBasicPixelLightingTxVcBn<3> dp4 oT1.z, v0, c5 // ::VSBasicPixelLightingTxVcBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -66,20 +66,20 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r1 // ::VSBasicPixelLightingTxVcBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT1.w, r0.x, c13.w // ::VSBasicPixelLightingTxVcBn<5> -#line 486 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 486 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT3.w, v3.w, c1.w // ::VSBasicPixelLightingTxVcBn<12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 476 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 476 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingTxVcBn<13,14> mov oPos.w, r0.z // ::VSBasicPixelLightingTxVcBn<16> @@ -124,10 +124,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = { - 68, 88, 66, 67, 108, 32, - 122, 106, 107, 93, 158, 19, - 78, 247, 112, 175, 124, 51, - 91, 134, 1, 0, 0, 0, + 68, 88, 66, 67, 23, 86, + 89, 63, 118, 226, 217, 101, + 209, 41, 236, 44, 48, 81, + 156, 106, 1, 0, 0, 0, 200, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 6, 0, 0, 144, 9, @@ -154,7 +154,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = 0, 0, 27, 0, 0, 0, 216, 0, 0, 0, 4, 0, 0, 0, 24, 4, 0, 0, - 212, 1, 0, 0, 67, 58, + 212, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -163,7 +163,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -172,7 +172,7 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb index f4e32b0d..521ca439 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.inc index 1ac4c0b5..7f56ed91 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.inc @@ -46,7 +46,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingVc<13> dp4 oT0.x, v0, c3 // ::VSBasicPixelLightingVc<0> dp4 oT0.y, v0, c4 // ::VSBasicPixelLightingVc<1> @@ -58,20 +58,20 @@ rsq r0.w, r0.w mul oT1.xyz, r0.w, r0 // ::VSBasicPixelLightingVc<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT0.w, r0.x, c13.y // ::VSBasicPixelLightingVc<3> -#line 410 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 410 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT2.w, v2.w, c1.w // ::VSBasicPixelLightingVc<10> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 402 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 402 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingVc<11,12> mov oPos.w, r0.z // ::VSBasicPixelLightingVc<14> @@ -111,10 +111,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingVc[] = { - 68, 88, 66, 67, 93, 137, - 183, 43, 226, 203, 108, 173, - 169, 206, 35, 192, 10, 21, - 211, 131, 1, 0, 0, 0, + 68, 88, 66, 67, 127, 42, + 211, 113, 119, 151, 186, 29, + 57, 7, 251, 106, 1, 27, + 221, 48, 1, 0, 0, 0, 104, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 4, 6, 0, 0, 104, 8, @@ -141,7 +141,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVc[] = 0, 0, 24, 0, 0, 0, 216, 0, 0, 0, 3, 0, 0, 0, 152, 3, 0, 0, - 152, 1, 0, 0, 67, 58, + 152, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -150,7 +150,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -159,7 +159,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb index 2bd93b5a..3c5e13ee 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.inc index 109dec32..0824ed5c 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.inc @@ -46,16 +46,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSBasicPixelLightingVcBn<13> dp4 oT0.x, v0, c3 // ::VSBasicPixelLightingVcBn<0> dp4 oT0.y, v0, c4 // ::VSBasicPixelLightingVcBn<1> dp4 oT0.z, v0, c5 // ::VSBasicPixelLightingVcBn<2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -63,20 +63,20 @@ rsq r0.x, r0.x mul oT1.xyz, r0.x, r1 // ::VSBasicPixelLightingVcBn<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT0.w, r0.x, c13.w // ::VSBasicPixelLightingVcBn<3> -#line 425 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 425 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT2.w, v2.w, c1.w // ::VSBasicPixelLightingVcBn<10> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 415 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 415 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicPixelLightingVcBn<11,12> mov oPos.w, r0.z // ::VSBasicPixelLightingVcBn<14> @@ -117,10 +117,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingVcBn[] = { - 68, 88, 66, 67, 246, 15, - 209, 224, 182, 79, 188, 184, - 64, 134, 144, 120, 97, 12, - 90, 7, 1, 0, 0, 0, + 68, 88, 66, 67, 136, 42, + 41, 63, 70, 213, 18, 143, + 110, 171, 120, 30, 244, 135, + 105, 42, 1, 0, 0, 0, 248, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 88, 6, 0, 0, 248, 8, @@ -147,7 +147,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVcBn[] = 0, 0, 25, 0, 0, 0, 216, 0, 0, 0, 4, 0, 0, 0, 196, 3, 0, 0, - 196, 1, 0, 0, 67, 58, + 196, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -156,7 +156,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -165,7 +165,7 @@ const BYTE BasicEffect_VSBasicPixelLightingVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb index 95b225a7..0c0d948b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc index db92763b..a4cb683d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc @@ -44,7 +44,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSBasicTx<12> #line 14 @@ -57,15 +57,15 @@ dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 96 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 96 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicTx<10,11> mov oPos.w, r0.z // ::VSBasicTx<13> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSBasicTx<0,1,2,3> mov oT1.xyz, c7.x // ::VSBasicTx<4,5,6> -#line 103 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 103 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v1 // ::VSBasicTx<8,9> // approximately 12 instruction slots used @@ -91,10 +91,10 @@ ret const BYTE BasicEffect_VSBasicTx[] = { - 68, 88, 66, 67, 188, 129, - 126, 116, 103, 233, 149, 242, - 35, 12, 100, 79, 181, 80, - 86, 165, 1, 0, 0, 0, + 68, 88, 66, 67, 82, 144, + 179, 10, 196, 148, 143, 212, + 18, 217, 77, 100, 92, 8, + 58, 1, 1, 0, 0, 0, 220, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 156, 4, 0, 0, 248, 5, @@ -121,7 +121,7 @@ const BYTE BasicEffect_VSBasicTx[] = 0, 0, 15, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 192, 2, 0, 0, - 20, 1, 0, 0, 67, 58, + 20, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -130,7 +130,7 @@ const BYTE BasicEffect_VSBasicTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb index 85f90608..1712f361 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc index 0ff66d2a..a3d93481 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc @@ -41,20 +41,20 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSBasicTxNoFog<8> dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 110 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 110 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicTxNoFog<6,7> mov oPos.w, r0.z // ::VSBasicTxNoFog<9> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSBasicTxNoFog<0,1,2,3> -#line 117 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 117 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT1.xy, v1 // ::VSBasicTxNoFog<4,5> // approximately 8 instruction slots used @@ -77,10 +77,10 @@ ret const BYTE BasicEffect_VSBasicTxNoFog[] = { - 68, 88, 66, 67, 231, 189, - 146, 188, 240, 33, 9, 37, - 164, 221, 124, 32, 226, 95, - 190, 57, 1, 0, 0, 0, + 68, 88, 66, 67, 24, 141, + 116, 152, 203, 155, 1, 34, + 110, 11, 82, 149, 51, 33, + 204, 87, 1, 0, 0, 0, 216, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 252, 3, 0, 0, 12, 5, @@ -105,7 +105,7 @@ const BYTE BasicEffect_VSBasicTxNoFog[] = 0, 0, 10, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 128, 2, 0, 0, - 236, 0, 0, 0, 67, 58, + 236, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -114,7 +114,7 @@ const BYTE BasicEffect_VSBasicTxNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb index ae5d7e29..0ceb90a5 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc index 35983969..91c8812e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc @@ -46,7 +46,7 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7,8,9> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSBasicTxVc<12> #line 14 @@ -54,22 +54,22 @@ max r0.x, r0.x, c7.x min oT1.w, r0.x, c7.y // ::VSBasicTxVc<7> -#line 132 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 132 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0, v2, c1 // ::VSBasicTxVc<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c3 // ::vout<0> dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 124 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 124 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicTxVc<10,11> mov oPos.w, r0.z // ::VSBasicTxVc<13> -#line 51 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 51 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT1.xyz, c7.x // ::VSBasicTxVc<4,5,6> -#line 131 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 131 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v1 // ::VSBasicTxVc<8,9> // approximately 12 instruction slots used @@ -96,10 +96,10 @@ ret const BYTE BasicEffect_VSBasicTxVc[] = { - 68, 88, 66, 67, 180, 69, - 13, 76, 160, 108, 61, 45, - 182, 110, 234, 25, 209, 102, - 179, 252, 1, 0, 0, 0, + 68, 88, 66, 67, 244, 254, + 180, 141, 54, 50, 1, 248, + 102, 133, 26, 34, 184, 23, + 96, 69, 1, 0, 0, 0, 60, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 204, 4, 0, 0, 60, 6, @@ -126,7 +126,7 @@ const BYTE BasicEffect_VSBasicTxVc[] = 0, 0, 16, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 224, 2, 0, 0, - 28, 1, 0, 0, 67, 58, + 28, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -135,7 +135,7 @@ const BYTE BasicEffect_VSBasicTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb index 46d0c99b..bbab5935 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc index 552a3bbb..c2945251 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc @@ -43,18 +43,18 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7,8,9> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSBasicTxVcNoFog<8> -#line 147 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 147 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0, v2, c1 // ::VSBasicTxVcNoFog<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 139 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 139 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicTxVcNoFog<6,7> mov oPos.w, r0.z // ::VSBasicTxVcNoFog<9> @@ -82,10 +82,10 @@ ret const BYTE BasicEffect_VSBasicTxVcNoFog[] = { - 68, 88, 66, 67, 6, 108, - 139, 206, 27, 211, 146, 166, - 166, 24, 195, 159, 206, 170, - 207, 124, 1, 0, 0, 0, + 68, 88, 66, 67, 94, 163, + 140, 42, 2, 14, 58, 27, + 141, 39, 187, 28, 150, 104, + 80, 25, 1, 0, 0, 0, 60, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 48, 4, 0, 0, 84, 5, @@ -110,7 +110,7 @@ const BYTE BasicEffect_VSBasicTxVcNoFog[] = 0, 0, 11, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 164, 2, 0, 0, - 244, 0, 0, 0, 67, 58, + 244, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -119,7 +119,7 @@ const BYTE BasicEffect_VSBasicTxVcNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb index e45bea63..8bd4a6be 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.inc index 3df73e9d..ca1b2a14 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.inc @@ -43,7 +43,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6,7> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSBasicVc<10> #line 14 @@ -51,19 +51,19 @@ max r0.x, r0.x, c7.x min oT1.w, r0.x, c7.y // ::VSBasicVc<7> -#line 75 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 75 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0, v1, c1 // ::VSBasicVc<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c3 // ::vout<0> dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 68 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 68 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVc<8,9> mov oPos.w, r0.z // ::VSBasicVc<11> -#line 51 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 51 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT1.xyz, c7.x // ::VSBasicVc<4,5,6> // approximately 11 instruction slots used @@ -87,10 +87,10 @@ ret const BYTE BasicEffect_VSBasicVc[] = { - 68, 88, 66, 67, 253, 45, - 110, 116, 59, 191, 215, 109, - 151, 192, 179, 14, 63, 9, - 193, 83, 1, 0, 0, 0, + 68, 88, 66, 67, 220, 239, + 109, 153, 138, 90, 80, 26, + 47, 75, 38, 243, 217, 200, + 211, 26, 1, 0, 0, 0, 100, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 96, 4, 0, 0, 164, 5, @@ -117,7 +117,7 @@ const BYTE BasicEffect_VSBasicVc[] = 0, 0, 14, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 140, 2, 0, 0, - 12, 1, 0, 0, 67, 58, + 12, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -126,7 +126,7 @@ const BYTE BasicEffect_VSBasicVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb index cf30d150..13d45811 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.inc index 9313332e..d09b0d7b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.inc @@ -40,18 +40,18 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6,7> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSBasicVcNoFog<6> -#line 89 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 89 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0, v1, c1 // ::VSBasicVcNoFog<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 82 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 82 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVcNoFog<4,5> mov oPos.w, r0.z // ::VSBasicVcNoFog<7> @@ -73,10 +73,10 @@ ret const BYTE BasicEffect_VSBasicVcNoFog[] = { - 68, 88, 66, 67, 233, 31, - 99, 251, 86, 224, 226, 152, - 66, 87, 226, 185, 119, 145, - 250, 118, 1, 0, 0, 0, + 68, 88, 66, 67, 124, 46, + 252, 180, 114, 75, 200, 75, + 47, 94, 44, 132, 95, 28, + 62, 105, 1, 0, 0, 0, 96, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 192, 3, 0, 0, 184, 4, @@ -101,7 +101,7 @@ const BYTE BasicEffect_VSBasicVcNoFog[] = 0, 0, 9, 0, 0, 0, 156, 0, 0, 0, 3, 0, 0, 0, 76, 2, 0, 0, - 228, 0, 0, 0, 67, 58, + 228, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -110,7 +110,7 @@ const BYTE BasicEffect_VSBasicVcNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb index ae82c2b7..ee7cc586 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.inc index a449973e..348e236c 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.inc @@ -43,7 +43,7 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, v1, c18 dp3 r0.y, v1, c19 dp3 r0.z, v1, c20 @@ -114,21 +114,21 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLighting<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.x min oT1.w, r0.x, c25.y // ::VSBasicVertexLighting<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 154 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 154 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLighting<8,9> mov oPos.w, r0.z // ::VSBasicVertexLighting<11> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicVertexLighting<3> // approximately 62 instruction slots used @@ -199,10 +199,10 @@ ret const BYTE BasicEffect_VSBasicVertexLighting[] = { - 68, 88, 66, 67, 7, 73, - 64, 14, 152, 121, 110, 137, - 190, 119, 152, 156, 97, 77, - 216, 2, 1, 0, 0, 0, + 68, 88, 66, 67, 200, 78, + 103, 37, 115, 13, 151, 160, + 222, 41, 187, 134, 43, 168, + 195, 80, 1, 0, 0, 0, 76, 18, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 160, 10, 0, 0, 140, 17, @@ -229,7 +229,7 @@ const BYTE BasicEffect_VSBasicVertexLighting[] = 0, 0, 55, 0, 0, 0, 216, 0, 0, 0, 13, 0, 0, 0, 144, 5, 0, 0, - 196, 2, 0, 0, 67, 58, + 196, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -238,7 +238,7 @@ const BYTE BasicEffect_VSBasicVertexLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -247,7 +247,7 @@ const BYTE BasicEffect_VSBasicVertexLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb index f857d55c..a6e4bc74 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.inc index 366b7f6c..a0b624ea 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.inc @@ -43,10 +43,10 @@ dcl_texcoord v0 // vin<0,1,2,3> dcl_texcoord1 v1 // vin<4,5,6> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c25.x, c25.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c18 dp3 r1.y, r0, c19 dp3 r1.z, r0, c20 @@ -117,21 +117,21 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingBn<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.z min oT1.w, r0.x, c25.w // ::VSBasicVertexLightingBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 164 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 164 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingBn<8,9> mov oPos.w, r0.z // ::VSBasicVertexLightingBn<11> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicVertexLightingBn<3> // approximately 63 instruction slots used @@ -203,10 +203,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingBn[] = { - 68, 88, 66, 67, 57, 147, - 41, 155, 74, 250, 233, 143, - 126, 22, 157, 139, 92, 248, - 235, 5, 1, 0, 0, 0, + 68, 88, 66, 67, 143, 2, + 133, 28, 132, 250, 153, 213, + 7, 116, 79, 187, 177, 26, + 33, 176, 1, 0, 0, 0, 220, 18, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 244, 10, 0, 0, 28, 18, @@ -233,7 +233,7 @@ const BYTE BasicEffect_VSBasicVertexLightingBn[] = 0, 0, 56, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 188, 5, 0, 0, - 240, 2, 0, 0, 67, 58, + 240, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -242,7 +242,7 @@ const BYTE BasicEffect_VSBasicVertexLightingBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -251,7 +251,7 @@ const BYTE BasicEffect_VSBasicVertexLightingBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb index 17bf9553..fb82f324 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc index 85c5478d..9b4fed1d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc @@ -46,7 +46,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, v1, c18 dp3 r0.y, v1, c19 dp3 r0.z, v1, c20 @@ -117,24 +117,24 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingTx<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.x min oT1.w, r0.x, c25.y // ::VSBasicVertexLightingTx<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 206 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 206 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingTx<10,11> mov oPos.w, r0.z // ::VSBasicVertexLightingTx<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicVertexLightingTx<3> -#line 213 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 213 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v2 // ::VSBasicVertexLightingTx<8,9> // approximately 63 instruction slots used @@ -208,10 +208,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTx[] = { - 68, 88, 66, 67, 211, 59, - 81, 62, 52, 224, 38, 225, - 105, 100, 238, 78, 26, 194, - 255, 19, 1, 0, 0, 0, + 68, 88, 66, 67, 226, 130, + 61, 191, 198, 60, 5, 84, + 126, 228, 76, 152, 208, 24, + 164, 45, 1, 0, 0, 0, 36, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 12, 11, 0, 0, 36, 18, @@ -238,7 +238,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTx[] = 0, 0, 57, 0, 0, 0, 216, 0, 0, 0, 13, 0, 0, 0, 228, 5, 0, 0, - 212, 2, 0, 0, 67, 58, + 212, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -247,7 +247,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -256,7 +256,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb index a98c8537..e3ea8f4d 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc index b0abe139..9e8ab63a 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc @@ -46,10 +46,10 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c25.x, c25.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c18 dp3 r1.y, r0, c19 dp3 r1.z, r0, c20 @@ -120,24 +120,24 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingTxBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.z min oT1.w, r0.x, c25.w // ::VSBasicVertexLightingTxBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 218 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 218 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingTxBn<10,11> mov oPos.w, r0.z // ::VSBasicVertexLightingTxBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c1.w // ::VSBasicVertexLightingTxBn<3> -#line 227 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 227 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mov oT2.xy, v2 // ::VSBasicVertexLightingTxBn<8,9> // approximately 64 instruction slots used @@ -212,10 +212,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = { - 68, 88, 66, 67, 128, 91, - 87, 46, 26, 180, 5, 78, - 145, 159, 184, 139, 84, 72, - 205, 231, 1, 0, 0, 0, + 68, 88, 66, 67, 67, 252, + 43, 68, 65, 54, 78, 234, + 225, 33, 248, 14, 203, 109, + 101, 72, 1, 0, 0, 0, 184, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 100, 11, 0, 0, 184, 18, @@ -242,7 +242,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = 0, 0, 58, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 20, 6, 0, 0, - 0, 3, 0, 0, 67, 58, + 0, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -251,7 +251,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -260,7 +260,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb index 0dc33ce2..f03d2929 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc index 459d6cef..bcc264b8 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc @@ -48,7 +48,7 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::pos_ws<0> dp4 r0.y, v0, c16 // ::pos_ws<1> dp4 r0.z, v0, c17 // ::pos_ws<2> @@ -114,28 +114,28 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingTxVc<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.x min oT1.w, r0.x, c25.y // ::VSBasicVertexLightingTxVc<7> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r0.xyz, r2.y, c8 mad r0.xyz, r2.x, c7, r0 mad r0.xyz, r2.z, c9, r0 mov r1.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r1, c2 // ::result<0,1,2> -#line 242 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 242 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r0, v3 // ::VSBasicVertexLightingTxVc<0,1,2> mul oT0.w, v3.w, c1.w // ::VSBasicVertexLightingTxVc<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 234 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 234 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingTxVc<10,11> mov oPos.w, r0.z // ::VSBasicVertexLightingTxVc<13> @@ -215,10 +215,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = { - 68, 88, 66, 67, 9, 203, - 24, 20, 122, 55, 82, 49, - 231, 68, 126, 82, 10, 219, - 115, 135, 1, 0, 0, 0, + 68, 88, 66, 67, 41, 130, + 30, 171, 115, 93, 44, 75, + 156, 10, 11, 22, 36, 193, + 68, 175, 1, 0, 0, 0, 12, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 11, 0, 0, 236, 18, @@ -245,7 +245,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = 0, 0, 59, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 72, 6, 0, 0, - 228, 2, 0, 0, 67, 58, + 228, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -254,7 +254,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -263,7 +263,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb index 8b0ebde4..126e88dd 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc index f383e6a5..2daf7d0a 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc @@ -48,7 +48,7 @@ dcl_texcoord2 v2 // vin<7,8> dcl_texcoord3 v3 // vin<9,10,11,12> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::pos_ws<0> dp4 r0.y, v0, c16 // ::pos_ws<1> dp4 r0.z, v0, c17 // ::pos_ws<2> @@ -59,10 +59,10 @@ add r0.xyz, r1, -c4 nrm r2.xyz, r0 // ::halfVectors<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c25.x, c25.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, r0, c18 dp3 r3.y, r0, c19 dp3 r3.z, r0, c20 @@ -117,28 +117,28 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingTxVcBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c14 max r0.w, r0.w, c25.z min oT1.w, r0.w, c25.w // ::VSBasicVertexLightingTxVcBn<7> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r1.xyz, r0.y, c8 mad r0.xyw, r0.x, c7.xyzz, r1.xyzz mad r0.xyz, r0.z, c9, r0.xyww mov r1.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r1, c2 // ::result<0,1,2> -#line 257 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 257 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r0, v3 // ::VSBasicVertexLightingTxVcBn<0,1,2> mul oT0.w, v3.w, c1.w // ::VSBasicVertexLightingTxVcBn<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 247 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 247 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingTxVcBn<10,11> mov oPos.w, r0.z // ::VSBasicVertexLightingTxVcBn<13> @@ -219,10 +219,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = { - 68, 88, 66, 67, 64, 8, - 215, 19, 106, 61, 168, 24, - 147, 158, 214, 161, 169, 4, - 224, 133, 1, 0, 0, 0, + 68, 88, 66, 67, 0, 94, + 139, 26, 102, 30, 30, 137, + 154, 112, 162, 58, 58, 189, + 145, 153, 1, 0, 0, 0, 156, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 248, 11, 0, 0, 124, 19, @@ -249,7 +249,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = 0, 0, 60, 0, 0, 0, 216, 0, 0, 0, 15, 0, 0, 0, 116, 6, 0, 0, - 16, 3, 0, 0, 67, 58, + 16, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -258,7 +258,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -267,7 +267,7 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb index 220cfa87..c1608e92 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.inc index 80337408..170bae76 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.inc @@ -45,7 +45,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::pos_ws<0> dp4 r0.y, v0, c16 // ::pos_ws<1> dp4 r0.z, v0, c17 // ::pos_ws<2> @@ -111,28 +111,28 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingVc<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c14 max r0.x, r0.x, c25.x min oT1.w, r0.x, c25.y // ::VSBasicVertexLightingVc<7> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r0.xyz, r2.y, c8 mad r0.xyz, r2.x, c7, r0 mad r0.xyz, r2.z, c9, r0 mov r1.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r1, c2 // ::result<0,1,2> -#line 185 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 185 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r0, v2 // ::VSBasicVertexLightingVc<0,1,2> mul oT0.w, v2.w, c1.w // ::VSBasicVertexLightingVc<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 178 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 178 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingVc<8,9> mov oPos.w, r0.z // ::VSBasicVertexLightingVc<11> @@ -206,10 +206,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingVc[] = { - 68, 88, 66, 67, 160, 146, - 27, 240, 208, 124, 161, 181, - 196, 209, 42, 70, 114, 176, - 227, 9, 1, 0, 0, 0, + 68, 88, 66, 67, 172, 211, + 161, 241, 101, 209, 216, 199, + 95, 212, 215, 95, 236, 1, + 60, 232, 1, 0, 0, 0, 48, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 52, 11, 0, 0, 80, 18, @@ -236,7 +236,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVc[] = 0, 0, 57, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 240, 5, 0, 0, - 212, 2, 0, 0, 67, 58, + 212, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -245,7 +245,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -254,7 +254,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb index 33dc30d4..f376fab7 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.inc index 7c4d91c3..7f65dfc1 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.inc @@ -45,7 +45,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8,9,10> -#line 57 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 57 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c15 // ::pos_ws<0> dp4 r0.y, v0, c16 // ::pos_ws<1> dp4 r0.z, v0, c17 // ::pos_ws<2> @@ -56,10 +56,10 @@ add r0.xyz, r1, -c4 nrm r2.xyz, r0 // ::halfVectors<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c25.x, c25.y // ::BiasX2<0,1,2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, r0, c18 dp3 r3.y, r0, c19 dp3 r3.z, r0, c20 @@ -114,28 +114,28 @@ #line 63 dp4 oPos.z, v0, c23 // ::VSBasicVertexLightingVcBn<10> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c14 max r0.w, r0.w, c25.z min oT1.w, r0.w, c25.w // ::VSBasicVertexLightingVcBn<7> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r1.xyz, r0.y, c8 mad r0.xyw, r0.x, c7.xyzz, r1.xyzz mad r0.xyz, r0.z, c9, r0.xyww mov r1.xyz, c1 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r1, c2 // ::result<0,1,2> -#line 199 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 199 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mul oT0.xyz, r0, v2 // ::VSBasicVertexLightingVcBn<0,1,2> mul oT0.w, v2.w, c1.w // ::VSBasicVertexLightingVcBn<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c21 // ::vout<0> dp4 r0.y, v0, c22 // ::vout<1> dp4 r0.z, v0, c24 // ::vout<3> -#line 190 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" +#line 190 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\BasicEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSBasicVertexLightingVcBn<8,9> mov oPos.w, r0.z // ::VSBasicVertexLightingVcBn<11> @@ -210,10 +210,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingVcBn[] = { - 68, 88, 66, 67, 50, 18, - 211, 125, 27, 236, 252, 244, - 247, 23, 119, 182, 227, 217, - 80, 142, 1, 0, 0, 0, + 68, 88, 66, 67, 190, 136, + 239, 253, 155, 50, 245, 254, + 137, 40, 245, 38, 3, 238, + 142, 189, 1, 0, 0, 0, 196, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 140, 11, 0, 0, 228, 18, @@ -240,7 +240,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVcBn[] = 0, 0, 58, 0, 0, 0, 216, 0, 0, 0, 15, 0, 0, 0, 32, 6, 0, 0, - 0, 3, 0, 0, 67, 58, + 0, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -249,7 +249,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -258,7 +258,7 @@ const BYTE BasicEffect_VSBasicVertexLightingVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb index 21eaf91b..312c4d60 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.inc index 6b5b787b..e3e8a323 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.inc @@ -54,7 +54,7 @@ dcl_texcoord2 v2 // vertex<7,8,9,10> dcl_texcoord3 v3 // vertex<11,12> -#line 129 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 129 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" dp4 oPos.z, v0, c7 // ::main<2> mad r0.xyz, v3.xyxw, c12.xxyw, c12.yyxw dp3 oT1.x, r0, c9.xyww // ::main<8> @@ -132,10 +132,10 @@ ret const BYTE DGSLEffect_main[] = { - 68, 88, 66, 67, 74, 4, - 114, 66, 121, 197, 169, 182, - 111, 100, 90, 86, 91, 85, - 88, 254, 1, 0, 0, 0, + 68, 88, 66, 67, 60, 22, + 249, 144, 118, 117, 82, 91, + 245, 152, 151, 33, 61, 199, + 4, 61, 1, 0, 0, 0, 104, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 248, 5, 0, 0, 232, 8, @@ -166,7 +166,7 @@ const BYTE DGSLEffect_main[] = 0, 0, 25, 0, 0, 0, 100, 0, 0, 0, 4, 0, 0, 0, 88, 3, 0, 0, - 44, 1, 0, 0, 67, 58, + 44, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.pdb index a2561a31..ce6676cf 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.inc index f77d572e..e1f8e3ea 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.inc @@ -59,7 +59,7 @@ dcl_texcoord4 v4 // vertex<13,14,15,16> dcl_texcoord5 v5 // vertex<17,18,19,20> -#line 97 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 97 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0.x, v4.x, c228.x mova a0.x, r0.x mul r0, v5.x, c0[a0.x] // ::skinning<0,3,6,9> @@ -181,10 +181,10 @@ ret const BYTE DGSLEffect_main1Bones[] = { - 68, 88, 66, 67, 240, 248, - 6, 203, 30, 228, 242, 125, - 237, 108, 143, 162, 100, 47, - 138, 34, 1, 0, 0, 0, + 68, 88, 66, 67, 105, 195, + 67, 91, 242, 242, 63, 241, + 115, 72, 255, 245, 54, 228, + 168, 140, 1, 0, 0, 0, 80, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 8, 0, 0, 132, 13, @@ -217,7 +217,7 @@ const BYTE DGSLEffect_main1Bones[] = 0, 0, 42, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 232, 4, 0, 0, - 180, 1, 0, 0, 67, 58, + 180, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.pdb index a610968f..a59a8c71 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1Bones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.inc index ec3d5560..cdb26a62 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.inc @@ -61,7 +61,7 @@ dcl_texcoord5 v5 // vertex<17,18,19,20> dcl_texcoord6 v6 // vertex<21,22,23,24> -#line 112 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 112 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0.x, v5.x, c228.x mova a0.x, r0.x mul r0, v6.x, c0[a0.x] // ::skinning<0,3,6,9> @@ -182,10 +182,10 @@ ret const BYTE DGSLEffect_main1BonesVc[] = { - 68, 88, 66, 67, 144, 199, - 36, 57, 84, 205, 83, 203, - 36, 159, 102, 63, 144, 0, - 168, 191, 1, 0, 0, 0, + 68, 88, 66, 67, 200, 62, + 96, 38, 217, 121, 75, 86, + 147, 199, 6, 110, 133, 142, + 7, 129, 1, 0, 0, 0, 184, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 0, 9, 0, 0, 208, 13, @@ -218,7 +218,7 @@ const BYTE DGSLEffect_main1BonesVc[] = 0, 0, 43, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 16, 5, 0, 0, - 188, 1, 0, 0, 67, 58, + 188, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.pdb index 9996e4cb..f6002993 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main1BonesVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.inc index 6e81572f..223c1c5d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.inc @@ -59,7 +59,7 @@ dcl_texcoord4 v4 // vertex<13,14,15,16> dcl_texcoord5 v5 // vertex<17,18,19,20> -#line 97 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 97 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0.xy, v4, c228.x mova a0.xy, r0.yxzw mul r0, v5.y, c0[a0.x] @@ -187,10 +187,10 @@ ret const BYTE DGSLEffect_main2Bones[] = { - 68, 88, 66, 67, 35, 166, - 155, 143, 155, 220, 149, 97, - 77, 63, 31, 132, 69, 152, - 93, 44, 1, 0, 0, 0, + 68, 88, 66, 67, 237, 188, + 230, 37, 34, 7, 240, 136, + 151, 86, 41, 111, 61, 180, + 18, 99, 1, 0, 0, 0, 72, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 40, 9, 0, 0, 124, 14, @@ -223,7 +223,7 @@ const BYTE DGSLEffect_main2Bones[] = 0, 0, 45, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 0, 5, 0, 0, - 204, 1, 0, 0, 67, 58, + 204, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.pdb index 081c1bd9..a5550e19 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2Bones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.inc index 5b58c66e..864a4838 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.inc @@ -61,7 +61,7 @@ dcl_texcoord5 v5 // vertex<17,18,19,20> dcl_texcoord6 v6 // vertex<21,22,23,24> -#line 112 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 112 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0.xy, v5, c228.x mova a0.xy, r0.yxzw mul r0, v6.y, c0[a0.x] @@ -188,10 +188,10 @@ ret const BYTE DGSLEffect_main2BonesVc[] = { - 68, 88, 66, 67, 35, 104, - 61, 115, 51, 78, 10, 24, - 116, 154, 117, 50, 150, 233, - 195, 56, 1, 0, 0, 0, + 68, 88, 66, 67, 91, 160, + 145, 61, 43, 220, 51, 238, + 108, 160, 121, 251, 126, 140, + 114, 42, 1, 0, 0, 0, 176, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 96, 9, 0, 0, 200, 14, @@ -224,7 +224,7 @@ const BYTE DGSLEffect_main2BonesVc[] = 0, 0, 46, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 40, 5, 0, 0, - 212, 1, 0, 0, 67, 58, + 212, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.pdb index 6b3f93fc..41549ee6 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main2BonesVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.inc index 9898eaac..86b2f09e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.inc @@ -59,7 +59,7 @@ dcl_texcoord4 v4 // vertex<13,14,15,16> dcl_texcoord5 v5 // vertex<17,18,19,20> -#line 97 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 97 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0, v4, c228.x mova a0, r0.yxzw mul r1, v5.y, c0[a0.x] @@ -199,10 +199,10 @@ ret const BYTE DGSLEffect_main4Bones[] = { - 68, 88, 66, 67, 78, 235, - 158, 81, 24, 97, 192, 121, - 85, 48, 18, 248, 166, 93, - 206, 191, 1, 0, 0, 0, + 68, 88, 66, 67, 92, 196, + 98, 230, 142, 236, 7, 11, + 53, 225, 142, 219, 104, 41, + 90, 174, 1, 0, 0, 0, 104, 18, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 48, 10, 0, 0, 156, 16, @@ -235,7 +235,7 @@ const BYTE DGSLEffect_main4Bones[] = 0, 0, 51, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 120, 5, 0, 0, - 252, 1, 0, 0, 67, 58, + 252, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.pdb index e15b3b4f..145188ef 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4Bones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.inc index 5f4442b7..700d18f3 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.inc @@ -61,7 +61,7 @@ dcl_texcoord5 v5 // vertex<17,18,19,20> dcl_texcoord6 v6 // vertex<21,22,23,24> -#line 112 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 112 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" mul r0, v5, c228.x mova a0, r0.yxzw mul r1, v6.y, c0[a0.x] @@ -200,10 +200,10 @@ ret const BYTE DGSLEffect_main4BonesVc[] = { - 68, 88, 66, 67, 134, 106, - 19, 125, 70, 199, 177, 109, - 48, 196, 230, 167, 168, 222, - 118, 108, 1, 0, 0, 0, + 68, 88, 66, 67, 177, 227, + 220, 246, 197, 197, 102, 147, + 208, 75, 222, 58, 4, 223, + 196, 31, 1, 0, 0, 0, 208, 18, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 104, 10, 0, 0, 232, 16, @@ -236,7 +236,7 @@ const BYTE DGSLEffect_main4BonesVc[] = 0, 0, 52, 0, 0, 0, 100, 0, 0, 0, 6, 0, 0, 0, 160, 5, 0, 0, - 4, 2, 0, 0, 67, 58, + 4, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.pdb index 14c7a5c0..26d238c0 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_main4BonesVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.inc index 2d33c77d..b3f5ddb3 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.inc @@ -56,7 +56,7 @@ dcl_texcoord3 v3 // vertex<11,12,13,14> dcl_texcoord4 v4 // vertex<15,16> -#line 150 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" +#line 150 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLEffect.fx" dp4 oPos.z, v0, c7 // ::mainVc<2> mul oT0, v3, c1 // ::mainVc<4,5,6,7> mad r0.xyz, v4.xyxw, c12.xxyw, c12.yyxw @@ -133,10 +133,10 @@ ret const BYTE DGSLEffect_mainVc[] = { - 68, 88, 66, 67, 136, 215, - 107, 90, 141, 225, 128, 229, - 190, 64, 60, 231, 223, 161, - 217, 255, 1, 0, 0, 0, + 68, 88, 66, 67, 62, 10, + 201, 149, 140, 41, 152, 190, + 192, 188, 230, 96, 123, 190, + 45, 43, 1, 0, 0, 0, 208, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 44, 6, 0, 0, 48, 9, @@ -167,7 +167,7 @@ const BYTE DGSLEffect_mainVc[] = 0, 0, 26, 0, 0, 0, 100, 0, 0, 0, 4, 0, 0, 0, 124, 3, 0, 0, - 52, 1, 0, 0, 67, 58, + 52, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.pdb index 321273e1..1325c34a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLEffect_mainVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.inc index a9a215a2..3eb0bcf9 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.inc @@ -39,7 +39,7 @@ dcl t0 // pixel<4,5,6,7> dcl t2.xyz // pixel<10,11,12> -#line 99 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" +#line 99 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" nrm r0.xyz, t2 // ::worldNormal<0,1,2> #line 82 @@ -103,10 +103,10 @@ ret const BYTE DGSLLambert_main[] = { - 68, 88, 66, 67, 174, 4, - 254, 132, 99, 67, 186, 78, - 159, 106, 160, 165, 168, 71, - 138, 196, 1, 0, 0, 0, + 68, 88, 66, 67, 5, 43, + 37, 74, 189, 75, 167, 197, + 197, 229, 234, 134, 172, 109, + 251, 143, 1, 0, 0, 0, 244, 8, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 96, 5, 0, 0, 212, 7, @@ -133,7 +133,7 @@ const BYTE DGSLLambert_main[] = 0, 0, 104, 0, 0, 0, 7, 0, 0, 0, 244, 2, 0, 0, 232, 1, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.pdb index 9bf446df..eba4373f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_main.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.inc index 1d9ccc41..850a6de5 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.inc @@ -40,7 +40,7 @@ dcl t0 // pixel<4,5,6,7> dcl t2.xyz // pixel<10,11,12> -#line 130 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" +#line 130 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" mul r0.w, t0.w, t0.w cmp r0, -r0.w, c10.x, c10.y texkill r0 @@ -115,10 +115,10 @@ ret const BYTE DGSLLambert_mainTk[] = { - 68, 88, 66, 67, 80, 113, - 18, 211, 90, 1, 83, 179, - 30, 56, 255, 45, 155, 51, - 196, 213, 1, 0, 0, 0, + 68, 88, 66, 67, 68, 111, + 92, 154, 39, 114, 67, 66, + 22, 113, 30, 246, 3, 255, + 112, 128, 1, 0, 0, 0, 128, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 5, 0, 0, 96, 8, @@ -145,7 +145,7 @@ const BYTE DGSLLambert_mainTk[] = 0, 0, 104, 0, 0, 0, 7, 0, 0, 0, 20, 3, 0, 0, 8, 2, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.pdb index 8e9cedf6..bb51fd5b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.inc index 7b6a245b..c8c16cc4 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.inc @@ -48,7 +48,7 @@ dcl t2.xyz // pixel<10,11,12> dcl_2d s0 -#line 149 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" +#line 149 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" texld r0, t1, s0 #line 139 @@ -121,10 +121,10 @@ ret const BYTE DGSLLambert_mainTx[] = { - 68, 88, 66, 67, 69, 147, - 8, 213, 93, 188, 77, 76, - 118, 189, 52, 49, 117, 111, - 217, 140, 1, 0, 0, 0, + 68, 88, 66, 67, 199, 147, + 58, 195, 42, 167, 33, 157, + 93, 3, 192, 217, 22, 234, + 210, 131, 1, 0, 0, 0, 32, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 28, 6, 0, 0, 0, 9, @@ -151,7 +151,7 @@ const BYTE DGSLLambert_mainTx[] = 0, 0, 23, 0, 0, 0, 104, 0, 0, 0, 9, 0, 0, 0, 72, 3, 0, 0, - 48, 2, 0, 0, 67, 58, + 48, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.pdb index 287dc070..c2d590c4 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.inc index 847a3295..d913b41a 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.inc @@ -49,7 +49,7 @@ dcl t2.xyz // pixel<10,11,12> dcl_2d s0 -#line 170 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" +#line 170 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLLambert.hlsl" texld r0, t1, s0 mul r1.w, r0.w, t0.w // ::local5<0> @@ -136,10 +136,10 @@ ret const BYTE DGSLLambert_mainTxTk[] = { - 68, 88, 66, 67, 203, 221, - 206, 139, 184, 149, 68, 84, - 173, 31, 118, 98, 246, 4, - 142, 31, 1, 0, 0, 0, + 68, 88, 66, 67, 77, 86, + 230, 186, 187, 68, 212, 97, + 27, 30, 69, 240, 216, 86, + 1, 102, 1, 0, 0, 0, 196, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 132, 6, 0, 0, 164, 9, @@ -166,7 +166,7 @@ const BYTE DGSLLambert_mainTxTk[] = 0, 0, 27, 0, 0, 0, 104, 0, 0, 0, 9, 0, 0, 0, 108, 3, 0, 0, - 80, 2, 0, 0, 67, 58, + 80, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.pdb index e755693b..d7bd2827 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLLambert_mainTxTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.inc index 53048d5b..b5342aef 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.inc @@ -44,7 +44,7 @@ dcl t2.xyz // pixel<10,11,12> dcl t4.xyz // pixel<16,17,18> -#line 104 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" +#line 104 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" mov r0.xyz, c1 // MaterialVars::MaterialSpecular<0,1,2> mul r1.xyz, r0, c4 mul r2.xyz, r0, c5 @@ -179,10 +179,10 @@ ret const BYTE DGSLPhong_main[] = { - 68, 88, 66, 67, 25, 127, - 133, 206, 170, 104, 248, 104, - 181, 246, 12, 251, 18, 12, - 200, 145, 1, 0, 0, 0, + 68, 88, 66, 67, 88, 111, + 128, 126, 121, 27, 158, 129, + 0, 46, 158, 235, 54, 56, + 7, 203, 1, 0, 0, 0, 244, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 160, 9, 0, 0, 212, 15, @@ -215,7 +215,7 @@ const BYTE DGSLPhong_main[] = 0, 0, 100, 0, 0, 0, 14, 0, 0, 0, 232, 4, 0, 0, 16, 3, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.pdb index f10941ea..f5e67ffb 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_main.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.inc index 46d13e21..bb030b4f 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.inc @@ -44,7 +44,7 @@ dcl t2.xyz // pixel<10,11,12> dcl t4.xyz // pixel<16,17,18> -#line 158 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" +#line 158 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" mul r0.w, t0.w, t0.w cmp r0, -r0.w, c13.x, c13.y texkill r0 @@ -192,10 +192,10 @@ ret const BYTE DGSLPhong_mainTk[] = { - 68, 88, 66, 67, 113, 239, - 65, 232, 97, 73, 50, 181, - 255, 233, 207, 170, 83, 77, - 205, 148, 1, 0, 0, 0, + 68, 88, 66, 67, 45, 166, + 197, 154, 38, 241, 226, 74, + 180, 85, 12, 14, 3, 139, + 204, 144, 1, 0, 0, 0, 24, 17, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 156, 9, 0, 0, 248, 15, @@ -228,7 +228,7 @@ const BYTE DGSLPhong_mainTk[] = 0, 0, 100, 0, 0, 0, 13, 0, 0, 0, 204, 4, 0, 0, 244, 2, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.pdb index d5035682..4ef64faa 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.inc index 64a87956..e64061ce 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.inc @@ -53,7 +53,7 @@ dcl t4.xyz // pixel<16,17,18> dcl_2d s0 -#line 180 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" +#line 180 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" texld r0, t1, s0 #line 104 @@ -195,10 +195,10 @@ ret const BYTE DGSLPhong_mainTx[] = { - 68, 88, 66, 67, 155, 190, - 92, 69, 60, 75, 214, 148, - 128, 181, 107, 223, 144, 204, - 85, 236, 1, 0, 0, 0, + 68, 88, 66, 67, 174, 87, + 157, 101, 34, 115, 59, 158, + 206, 73, 89, 201, 135, 227, + 164, 71, 1, 0, 0, 0, 192, 17, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 16, 10, 0, 0, 160, 16, @@ -231,7 +231,7 @@ const BYTE DGSLPhong_mainTx[] = 0, 0, 48, 0, 0, 0, 100, 0, 0, 0, 15, 0, 0, 0, 16, 5, 0, 0, - 80, 3, 0, 0, 67, 58, + 80, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.pdb index 6f2a61b3..5c33f0b5 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.inc index 6af18114..ae2920f2 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.inc @@ -53,7 +53,7 @@ dcl t4.xyz // pixel<16,17,18> dcl_2d s0 -#line 204 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" +#line 204 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLPhong.hlsl" texld r0, t1, s0 mul r1.w, r0.w, t0.w // ::local6<0> @@ -209,10 +209,10 @@ ret const BYTE DGSLPhong_mainTxTk[] = { - 68, 88, 66, 67, 31, 215, - 171, 135, 211, 58, 140, 78, - 100, 59, 96, 31, 241, 242, - 101, 242, 1, 0, 0, 0, + 68, 88, 66, 67, 88, 86, + 191, 123, 26, 123, 120, 167, + 91, 2, 113, 235, 0, 84, + 174, 38, 1, 0, 0, 0, 252, 17, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 16, 10, 0, 0, 220, 16, @@ -245,7 +245,7 @@ const BYTE DGSLPhong_mainTxTk[] = 0, 0, 51, 0, 0, 0, 100, 0, 0, 0, 14, 0, 0, 0, 248, 4, 0, 0, - 52, 3, 0, 0, 67, 58, + 52, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.pdb index a5f967eb..42162618 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLPhong_mainTxTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.inc index cde0dcd3..5960706e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.inc @@ -29,7 +29,7 @@ ps_2_0 dcl t0 // pixel<4,5,6,7> -#line 83 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" +#line 83 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" mov oC0, t0 // ::main<0,1,2,3> // approximately 1 instruction slot used @@ -43,10 +43,10 @@ ret const BYTE DGSLUnlit_main[] = { - 68, 88, 66, 67, 76, 140, - 185, 32, 123, 179, 99, 117, - 5, 203, 145, 0, 28, 118, - 36, 25, 1, 0, 0, 0, + 68, 88, 66, 67, 48, 128, + 218, 3, 7, 91, 254, 163, + 128, 77, 245, 30, 67, 227, + 240, 231, 1, 0, 0, 0, 172, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 76, 2, 0, 0, 140, 2, @@ -67,7 +67,7 @@ const BYTE DGSLUnlit_main[] = 0, 0, 100, 0, 0, 0, 2, 0, 0, 0, 120, 1, 0, 0, 116, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.pdb index 395ffa20..c3c848f3 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_main.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.inc index acfa6d32..f7a39104 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.inc @@ -30,7 +30,7 @@ def c0, -1, -0, 0, 0 dcl t0 // pixel<4,5,6,7> -#line 93 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" +#line 93 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" mul r0.w, t0.w, t0.w cmp r0, -r0.w, c0.x, c0.y texkill r0 @@ -51,10 +51,10 @@ ret const BYTE DGSLUnlit_mainTk[] = { - 68, 88, 66, 67, 181, 76, - 169, 245, 125, 51, 210, 255, - 22, 180, 214, 164, 175, 50, - 140, 128, 1, 0, 0, 0, + 68, 88, 66, 67, 150, 128, + 102, 201, 14, 10, 10, 51, + 181, 90, 182, 110, 47, 204, + 156, 50, 1, 0, 0, 0, 96, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 208, 2, 0, 0, 64, 3, @@ -75,7 +75,7 @@ const BYTE DGSLUnlit_mainTk[] = 0, 0, 100, 0, 0, 0, 2, 0, 0, 0, 172, 1, 0, 0, 156, 0, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.pdb index 55648445..01af53b1 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.inc index 4b96796f..ec8b50eb 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.inc @@ -38,7 +38,7 @@ dcl t1.xy // pixel<8,9> dcl_2d s0 -#line 117 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" +#line 117 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" texld r0, t1, s0 mul r1, r0, t0 // ::local3<0,1,2>, ::local4<0> mov oC0, r1 // ::mainTx<0,1,2,3> @@ -59,10 +59,10 @@ ret const BYTE DGSLUnlit_mainTx[] = { - 68, 88, 66, 67, 120, 227, - 220, 111, 213, 205, 214, 36, - 63, 162, 186, 62, 127, 189, - 193, 69, 1, 0, 0, 0, + 68, 88, 66, 67, 20, 246, + 10, 67, 162, 162, 136, 188, + 227, 85, 139, 18, 93, 173, + 137, 7, 1, 0, 0, 0, 204, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 16, 3, 0, 0, 172, 3, @@ -83,7 +83,7 @@ const BYTE DGSLUnlit_mainTx[] = 0, 0, 6, 0, 0, 0, 100, 0, 0, 0, 4, 0, 0, 0, 216, 1, 0, 0, - 220, 0, 0, 0, 67, 58, + 220, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.pdb index 90221564..366f826a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.inc index 37ccab0e..6ce0ed30 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.inc @@ -39,7 +39,7 @@ dcl t1.xy // pixel<8,9> dcl_2d s0 -#line 144 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" +#line 144 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DGSLUnlit.hlsl" texld r0, t1, s0 mul r1.w, r0.w, t0.w // ::local4<0> @@ -74,10 +74,10 @@ ret const BYTE DGSLUnlit_mainTxTk[] = { - 68, 88, 66, 67, 124, 173, - 95, 254, 152, 55, 187, 233, - 237, 223, 77, 85, 51, 161, - 139, 255, 1, 0, 0, 0, + 68, 88, 66, 67, 103, 138, + 14, 78, 247, 142, 224, 83, + 188, 196, 69, 24, 63, 145, + 4, 76, 1, 0, 0, 0, 164, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 144, 3, 0, 0, 132, 4, @@ -98,7 +98,7 @@ const BYTE DGSLUnlit_mainTxTk[] = 0, 0, 11, 0, 0, 0, 100, 0, 0, 0, 4, 0, 0, 0, 4, 2, 0, 0, - 4, 1, 0, 0, 67, 58, + 4, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.pdb index dd8a3ac5..88bd7220 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DGSLUnlit_mainTxTk.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc index ee4f98cc..b42eeb61 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc @@ -45,7 +45,7 @@ dcl_2d s0 dcl_2d s1 -#line 98 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 98 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mov r0.xy, t2.wzyx texld r0, r0, s1 // ::overlay<0,1,2,3> texld r1, t2, s0 // ::color<0,1,2,3> @@ -55,7 +55,7 @@ mul r1, r1, c1 mul r0, r0, r1 // ::color<0,1,2,3> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c0, r0.w, -r0 mad r0.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r0 // ::PSDualTexture<0,1,2,3> @@ -87,10 +87,10 @@ ret const BYTE DualTextureEffect_PSDualTexture[] = { - 68, 88, 66, 67, 38, 99, - 199, 75, 242, 3, 79, 186, - 138, 169, 51, 70, 176, 119, - 225, 51, 1, 0, 0, 0, + 68, 88, 66, 67, 93, 190, + 211, 98, 110, 140, 45, 18, + 148, 209, 208, 222, 144, 101, + 83, 11, 1, 0, 0, 0, 128, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 32, 4, 0, 0, 204, 5, @@ -114,7 +114,7 @@ const BYTE DualTextureEffect_PSDualTexture[] = 15, 0, 0, 0, 164, 0, 0, 0, 5, 0, 0, 0, 48, 2, 0, 0, 28, 1, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -124,7 +124,7 @@ const BYTE DualTextureEffect_PSDualTexture[] = 92, 68, 117, 97, 108, 84, 101, 120, 116, 117, 114, 101, 69, 102, 102, 101, 99, 116, - 46, 102, 120, 0, 67, 58, + 46, 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb index ee3c94cb..1c37148f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc index f61d63ac..13ebef33 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc @@ -36,7 +36,7 @@ dcl_2d s0 dcl_2d s1 -#line 113 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 113 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mov r0.xy, t1.wzyx texld r0, r0, s1 // ::overlay<0,1,2,3> texld r1, t1, s0 // ::color<0,1,2,3> @@ -69,10 +69,10 @@ ret const BYTE DualTextureEffect_PSDualTextureNoFog[] = { - 68, 88, 66, 67, 19, 8, - 7, 40, 156, 123, 108, 37, - 81, 229, 171, 109, 9, 125, - 67, 201, 1, 0, 0, 0, + 68, 88, 66, 67, 134, 108, + 202, 85, 227, 222, 33, 209, + 168, 154, 91, 236, 78, 7, + 64, 232, 1, 0, 0, 0, 24, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 80, 3, 0, 0, 124, 4, @@ -94,7 +94,7 @@ const BYTE DualTextureEffect_PSDualTextureNoFog[] = 12, 0, 0, 0, 108, 0, 0, 0, 4, 0, 0, 0, 180, 1, 0, 0, 204, 0, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb index 9a4bf788..760871b9 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc index ac63dbb4..1013826e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc @@ -46,7 +46,7 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSDualTexture<14> #line 14 @@ -59,15 +59,15 @@ dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSDualTexture<12,13> mov oPos.w, r0.z // ::VSDualTexture<15> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSDualTexture<0,1,2,3> mov oT1.xyz, c7.x // ::VSDualTexture<4,5,6> -#line 40 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 40 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mov oT2.xy, v1 // ::VSDualTexture<8,9> mov oT2.zw, v2.xyyx // ::VSDualTexture<11,10> @@ -97,10 +97,10 @@ ret const BYTE DualTextureEffect_VSDualTexture[] = { - 68, 88, 66, 67, 94, 59, - 24, 18, 169, 109, 112, 90, - 199, 116, 129, 13, 54, 162, - 57, 167, 1, 0, 0, 0, + 68, 88, 66, 67, 96, 215, + 135, 135, 114, 179, 84, 3, + 149, 39, 0, 95, 100, 118, + 217, 145, 1, 0, 0, 0, 148, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 248, 4, 0, 0, 128, 6, @@ -125,7 +125,7 @@ const BYTE DualTextureEffect_VSDualTexture[] = 0, 0, 17, 0, 0, 0, 164, 0, 0, 0, 3, 0, 0, 0, 16, 3, 0, 0, - 44, 1, 0, 0, 67, 58, + 44, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -134,7 +134,7 @@ const BYTE DualTextureEffect_VSDualTexture[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb index 9f269b9a..4eeee01f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc index 6de3603b..2a8a5f03 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc @@ -44,20 +44,20 @@ dcl_texcoord1 v1 // vin<4,5> dcl_texcoord2 v2 // vin<6,7> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSDualTextureNoFog<10> dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 48 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 48 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSDualTextureNoFog<8,9> mov oPos.w, r0.z // ::VSDualTextureNoFog<11> -#line 50 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 50 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT0, c1 // ::VSDualTextureNoFog<0,1,2,3> -#line 55 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 55 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mov oT1.xy, v1 // ::VSDualTextureNoFog<4,5> mov oT1.zw, v2.xyyx // ::VSDualTextureNoFog<7,6> @@ -84,10 +84,10 @@ ret const BYTE DualTextureEffect_VSDualTextureNoFog[] = { - 68, 88, 66, 67, 93, 83, - 68, 27, 208, 240, 226, 244, - 169, 83, 240, 30, 58, 224, - 98, 76, 1, 0, 0, 0, + 68, 88, 66, 67, 16, 56, + 120, 226, 31, 138, 98, 120, + 120, 166, 26, 124, 242, 80, + 148, 91, 1, 0, 0, 0, 156, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 100, 4, 0, 0, 160, 5, @@ -112,7 +112,7 @@ const BYTE DualTextureEffect_VSDualTextureNoFog[] = 0, 0, 12, 0, 0, 0, 164, 0, 0, 0, 3, 0, 0, 0, 208, 2, 0, 0, - 4, 1, 0, 0, 67, 58, + 4, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -121,7 +121,7 @@ const BYTE DualTextureEffect_VSDualTextureNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb index 2c1b51f2..ef6c7ac2 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc index 862b843f..effb7a19 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc @@ -48,7 +48,7 @@ dcl_texcoord2 v2 // vin<6,7> dcl_texcoord3 v3 // vin<8,9,10,11> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c5 // ::VSDualTextureVc<14> #line 14 @@ -56,22 +56,22 @@ max r0.x, r0.x, c7.x min oT1.w, r0.x, c7.y // ::VSDualTextureVc<7> -#line 72 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 72 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mul oT0, v3, c1 // ::VSDualTextureVc<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c3 // ::vout<0> dp4 r0.y, v0, c4 // ::vout<1> dp4 r0.z, v0, c6 // ::vout<3> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSDualTextureVc<12,13> mov oPos.w, r0.z // ::VSDualTextureVc<15> -#line 51 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 51 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mov oT1.xyz, c7.x // ::VSDualTextureVc<4,5,6> -#line 70 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 70 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mov oT2.xy, v1 // ::VSDualTextureVc<8,9> mov oT2.zw, v2.xyyx // ::VSDualTextureVc<11,10> @@ -102,10 +102,10 @@ ret const BYTE DualTextureEffect_VSDualTextureVc[] = { - 68, 88, 66, 67, 72, 5, - 67, 132, 109, 127, 116, 111, - 239, 45, 3, 66, 179, 228, - 80, 82, 1, 0, 0, 0, + 68, 88, 66, 67, 233, 83, + 115, 81, 128, 139, 8, 115, + 150, 50, 128, 143, 64, 79, + 118, 95, 1, 0, 0, 0, 244, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 40, 5, 0, 0, 196, 6, @@ -130,7 +130,7 @@ const BYTE DualTextureEffect_VSDualTextureVc[] = 0, 0, 18, 0, 0, 0, 164, 0, 0, 0, 3, 0, 0, 0, 48, 3, 0, 0, - 52, 1, 0, 0, 67, 58, + 52, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -139,7 +139,7 @@ const BYTE DualTextureEffect_VSDualTextureVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb index f8f96d8c..49978783 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc index 38cb039c..9520cac0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc @@ -46,18 +46,18 @@ dcl_texcoord2 v2 // vin<6,7> dcl_texcoord3 v3 // vin<8,9,10,11> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 oPos.z, v0, c4 // ::VSDualTextureVcNoFog<10> -#line 88 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 88 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mul oT0, v3, c1 // ::VSDualTextureVcNoFog<0,1,2,3> -#line 49 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 49 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 // ::vout<0> dp4 r0.y, v0, c3 // ::vout<1> dp4 r0.z, v0, c5 // ::vout<3> -#line 79 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" +#line 79 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\DualTextureEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSDualTextureVcNoFog<8,9> mov oPos.w, r0.z // ::VSDualTextureVcNoFog<11> @@ -89,10 +89,10 @@ ret const BYTE DualTextureEffect_VSDualTextureVcNoFog[] = { - 68, 88, 66, 67, 50, 120, - 119, 116, 49, 137, 216, 88, - 182, 128, 201, 15, 123, 28, - 203, 9, 1, 0, 0, 0, + 68, 88, 66, 67, 17, 130, + 73, 201, 222, 221, 152, 237, + 246, 47, 168, 249, 31, 102, + 202, 82, 1, 0, 0, 0, 0, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 4, 0, 0, 232, 5, @@ -117,7 +117,7 @@ const BYTE DualTextureEffect_VSDualTextureVcNoFog[] = 0, 0, 13, 0, 0, 0, 164, 0, 0, 0, 3, 0, 0, 0, 244, 2, 0, 0, - 12, 1, 0, 0, 67, 58, + 12, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -126,7 +126,7 @@ const BYTE DualTextureEffect_VSDualTextureVcNoFog[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb index dc9ae324..cd35ec2b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc index 4e238b3a..68a7f363 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc @@ -45,7 +45,7 @@ dcl_2d s0 dcl_cube s1 -#line 205 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 205 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" texld r0, t3, s1 texld r1, t2, s0 mul r1, r1, t0 // ::color<0,1,2,3> @@ -54,7 +54,7 @@ mad r0.xyz, r0, r1.w, -r1 mad r0.xyz, t1, r0, r1 // ::color<0,1,2> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r2.xyz, c0, r1.w, -r0 mad r1.xyz, t1.w, r2, r0 // ApplyFog::color<0,1,2> mov oC0, r1 // ::PSEnvMap<0,1,2,3> @@ -86,10 +86,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMap[] = { - 68, 88, 66, 67, 57, 173, - 89, 45, 2, 252, 185, 36, - 194, 126, 105, 63, 6, 223, - 149, 101, 1, 0, 0, 0, + 68, 88, 66, 67, 159, 245, + 76, 7, 142, 11, 248, 79, + 122, 126, 23, 141, 99, 219, + 97, 235, 1, 0, 0, 0, 100, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 252, 3, 0, 0, 176, 5, @@ -113,7 +113,7 @@ const BYTE EnvironmentMapEffect_PSEnvMap[] = 14, 0, 0, 0, 168, 0, 0, 0, 4, 0, 0, 0, 48, 2, 0, 0, 24, 1, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -124,7 +124,7 @@ const BYTE EnvironmentMapEffect_PSEnvMap[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb index 0a46e91d..cc3bbcc6 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc index 3188723c..013f08d7 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc @@ -38,7 +38,7 @@ dcl_2d s0 dcl_cube s1 -#line 219 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 219 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" texld r0, t3, s1 texld r1, t2, s0 mul r1, r1, t0 // ::color<0,1,2,3> @@ -72,10 +72,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapNoFog[] = { - 68, 88, 66, 67, 50, 37, - 62, 75, 2, 114, 82, 124, - 107, 5, 136, 83, 185, 126, - 27, 223, 1, 0, 0, 0, + 68, 88, 66, 67, 180, 44, + 2, 115, 238, 18, 26, 161, + 145, 155, 71, 173, 227, 21, + 89, 185, 1, 0, 0, 0, 100, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 92, 3, 0, 0, 176, 4, @@ -97,7 +97,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapNoFog[] = 12, 0, 0, 0, 112, 0, 0, 0, 3, 0, 0, 0, 216, 1, 0, 0, 208, 0, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb index 248cce77..54e3bce8 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc index 1475cc47..29b47c42 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc @@ -46,7 +46,7 @@ dcl_2d s0 dcl_cube s1 -#line 92 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 92 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" nrm r0.xyz, t2 // ::worldNormal<0,1,2> add r1.xyz, -t1, c10 nrm r2.xyz, r1 // ::eyeVector<0,1,2> @@ -62,7 +62,7 @@ #line 100 texld r1, r1, s1 -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, -c4, r0 // ::dotL<0> dp3 r3.y, -c5, r0 // ::dotL<1> dp3 r3.z, -c6, r0 // ::dotL<2> @@ -78,7 +78,7 @@ mov r3.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c3 // ::result<0,1,2> -#line 89 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 89 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mul r2, r2, t3 // ::color<0,1,2,3> #line 96 @@ -94,7 +94,7 @@ #line 109 mad r0.xyz, c0, r0.w, r0 // ::color<0,1,2> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c11, r2.w, -r0 mad r2.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r2 // ::PSEnvMapPixelLighting<0,1,2,3> @@ -149,10 +149,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = { - 68, 88, 66, 67, 211, 117, - 118, 123, 125, 214, 139, 172, - 159, 31, 64, 128, 54, 207, - 30, 237, 1, 0, 0, 0, + 68, 88, 66, 67, 252, 201, + 117, 228, 6, 186, 229, 21, + 122, 165, 68, 7, 74, 35, + 92, 125, 1, 0, 0, 0, 132, 13, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 32, 8, 0, 0, 208, 12, @@ -176,7 +176,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = 34, 0, 0, 0, 224, 0, 0, 0, 13, 0, 0, 0, 76, 4, 0, 0, 36, 2, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -187,7 +187,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, @@ -196,7 +196,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, 104, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb index 63cd05e5..9d2810cf 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc index be9a10be..80695e69 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc @@ -46,7 +46,7 @@ dcl_2d s0 dcl_cube s1 -#line 92 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 92 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" nrm r0.xyz, t2 // ::worldNormal<0,1,2> add r1.xyz, -t1, c10 nrm r2.xyz, r1 // ::eyeVector<0,1,2> @@ -62,7 +62,7 @@ #line 100 texld r1, r1, s1 -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r4.x, -c4, r0 // ::dotL<0> dp3 r4.y, -c5, r0 // ::dotL<1> dp3 r4.z, -c6, r0 // ::dotL<2> @@ -78,7 +78,7 @@ mov r5.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad r4.xyz, r4, r5, c3 // ::result<0,1,2> -#line 89 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 89 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mul r3, r3, t3 // ::color<0,1,2,3> #line 96 @@ -102,7 +102,7 @@ #line 109 mad r0.xyz, c0, r0.w, r0 // ::color<0,1,2> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, c11, r3.w, -r0 mad r3.xyz, t1.w, r1, r0 // ApplyFog::color<0,1,2> mov oC0, r3 // ::PSEnvMapPixelLightingFresnel<0,1,2,3> @@ -164,10 +164,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = { - 68, 88, 66, 67, 184, 140, - 8, 70, 178, 196, 23, 231, - 142, 232, 150, 207, 49, 228, - 228, 187, 1, 0, 0, 0, + 68, 88, 66, 67, 109, 154, + 179, 107, 184, 119, 137, 38, + 235, 37, 108, 115, 228, 117, + 24, 176, 1, 0, 0, 0, 88, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 56, 9, 0, 0, 164, 14, @@ -191,7 +191,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = 40, 0, 0, 0, 224, 0, 0, 0, 15, 0, 0, 0, 224, 4, 0, 0, 136, 2, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -202,7 +202,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, @@ -211,7 +211,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, 104, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb index c45b39b6..69f221cd 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc index a3583bdf..92fc5ef0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc @@ -46,7 +46,7 @@ dcl_2d s0 dcl_cube s1 -#line 92 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 92 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" nrm r0.xyz, t2 // ::worldNormal<0,1,2> add r1.xyz, -t1, c10 nrm r2.xyz, r1 // ::eyeVector<0,1,2> @@ -62,7 +62,7 @@ #line 100 texld r1, r1, s1 -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r4.x, -c4, r0 // ::dotL<0> dp3 r4.y, -c5, r0 // ::dotL<1> dp3 r4.z, -c6, r0 // ::dotL<2> @@ -78,7 +78,7 @@ mov r5.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad r4.xyz, r4, r5, c3 // ::result<0,1,2> -#line 89 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 89 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mul r3, r3, t3 // ::color<0,1,2,3> #line 96 @@ -158,10 +158,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog[] = { - 68, 88, 66, 67, 248, 144, - 122, 174, 225, 193, 231, 5, - 99, 191, 148, 133, 35, 124, - 121, 101, 1, 0, 0, 0, + 68, 88, 66, 67, 149, 182, + 252, 156, 198, 235, 240, 136, + 120, 92, 214, 160, 170, 173, + 0, 194, 1, 0, 0, 0, 116, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 8, 0, 0, 192, 13, @@ -185,7 +185,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog[] = 38, 0, 0, 0, 168, 0, 0, 0, 14, 0, 0, 0, 136, 4, 0, 0, 64, 2, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -196,7 +196,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb index 5ebeabb3..4630ec61 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc index 3b640b51..3aaf8eea 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc @@ -46,7 +46,7 @@ dcl_2d s0 dcl_cube s1 -#line 92 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 92 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" nrm r0.xyz, t2 // ::worldNormal<0,1,2> add r1.xyz, -t1, c10 nrm r2.xyz, r1 // ::eyeVector<0,1,2> @@ -62,7 +62,7 @@ #line 100 texld r1, r1, s1 -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, -c4, r0 // ::dotL<0> dp3 r3.y, -c5, r0 // ::dotL<1> dp3 r3.z, -c6, r0 // ::dotL<2> @@ -78,7 +78,7 @@ mov r3.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c3 // ::result<0,1,2> -#line 89 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 89 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mul r2, r2, t3 // ::color<0,1,2,3> #line 96 @@ -143,10 +143,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingNoFog[] = { - 68, 88, 66, 67, 73, 85, - 32, 195, 23, 1, 160, 190, - 217, 67, 246, 209, 73, 251, - 133, 93, 1, 0, 0, 0, + 68, 88, 66, 67, 36, 34, + 58, 45, 126, 236, 154, 179, + 156, 37, 186, 214, 31, 58, + 170, 188, 1, 0, 0, 0, 160, 12, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 140, 7, 0, 0, 236, 11, @@ -170,7 +170,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingNoFog[] = 32, 0, 0, 0, 168, 0, 0, 0, 12, 0, 0, 0, 244, 3, 0, 0, 220, 1, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -181,7 +181,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingNoFog[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb index 7222f642..80d6c87b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc index a1f08104..23d3e463 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc @@ -46,7 +46,7 @@ dcl_2d s0 dcl_cube s1 -#line 231 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 231 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" texld r0, t3, s1 texld r1, t2, s0 mul r1, r1, t0 // ::color<0,1,2,3> @@ -57,7 +57,7 @@ mad r0.xyz, t1, r0, r1 // ::color<0,1,2> mad r0.xyz, c0, r0.w, r0 // ::color<0,1,2> -#line 20 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 20 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r2.xyz, c1, r1.w, -r0 mad r1.xyz, t1.w, r2, r0 // ApplyFog::color<0,1,2> mov oC0, r1 // ::PSEnvMapSpecular<0,1,2,3> @@ -91,10 +91,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapSpecular[] = { - 68, 88, 66, 67, 95, 74, - 103, 149, 14, 76, 181, 229, - 161, 242, 32, 38, 252, 66, - 222, 59, 1, 0, 0, 0, + 68, 88, 66, 67, 102, 163, + 64, 101, 215, 231, 215, 250, + 254, 235, 126, 201, 19, 247, + 59, 233, 1, 0, 0, 0, 36, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 120, 4, 0, 0, 112, 6, @@ -120,7 +120,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapSpecular[] = 16, 0, 0, 0, 168, 0, 0, 0, 5, 0, 0, 0, 104, 2, 0, 0, 40, 1, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -131,7 +131,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapSpecular[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb index 95f5d443..6e2b17eb 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc index 8e8a3cad..a5124b21 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc @@ -45,7 +45,7 @@ dcl_2d s0 dcl_cube s1 -#line 246 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 246 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" texld r0, t3, s1 texld r1, t2, s0 mul r1, r1, t0 // ::color<0,1,2,3> @@ -84,10 +84,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapSpecularNoFog[] = { - 68, 88, 66, 67, 237, 95, - 192, 109, 180, 218, 43, 109, - 168, 84, 96, 35, 169, 239, - 64, 150, 1, 0, 0, 0, + 68, 88, 66, 67, 112, 94, + 234, 79, 234, 83, 22, 118, + 229, 255, 226, 21, 64, 23, + 6, 122, 1, 0, 0, 0, 52, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 216, 3, 0, 0, 128, 5, @@ -111,7 +111,7 @@ const BYTE EnvironmentMapEffect_PSEnvMapSpecularNoFog[] = 14, 0, 0, 0, 112, 0, 0, 0, 4, 0, 0, 0, 16, 2, 0, 0, 224, 0, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb index 61d4dcbb..a95fd1ea 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc index a07f1fc5..b7670455 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc @@ -47,13 +47,13 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, v1, c15 dp3 r0.y, v1, c16 dp3 r0.z, v1, c17 nrm r1.xyz, r0 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, -c4, r1 // ::dotL<0> dp3 r0.y, -c5, r1 // ::dotL<1> dp3 r0.z, -c6, r1 // ::dotL<2> @@ -69,15 +69,15 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r0, r2, c3 // ::VSEnvMap<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c20 // ::VSEnvMap<15> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c11 max r0.x, r0.x, c22.x min oT1.w, r0.x, c22.y // ::VSEnvMap<7> -#line 65 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 65 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 r0.x, v0, c12 // ::pos_ws<0> dp4 r0.y, v0, c13 // ::pos_ws<1> dp4 r0.z, v0, c14 // ::pos_ws<2> @@ -98,10 +98,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMap<13,14> mov oPos.w, r0.z // ::VSEnvMap<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMap<3> -#line 77 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 77 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT1.xyz, c1.x // ::VSEnvMap<4,5,6> #line 118 @@ -159,10 +159,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMap[] = { - 68, 88, 66, 67, 147, 89, - 142, 59, 85, 157, 42, 188, - 148, 107, 60, 192, 170, 121, - 230, 197, 1, 0, 0, 0, + 68, 88, 66, 67, 143, 199, + 174, 83, 100, 64, 33, 91, + 17, 70, 48, 175, 136, 68, + 34, 190, 1, 0, 0, 0, 96, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 124, 8, 0, 0, 72, 13, @@ -189,7 +189,7 @@ const BYTE EnvironmentMapEffect_VSEnvMap[] = 0, 0, 38, 0, 0, 0, 224, 0, 0, 0, 10, 0, 0, 0, 164, 4, 0, 0, - 68, 2, 0, 0, 67, 58, + 68, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -200,7 +200,7 @@ const BYTE EnvironmentMapEffect_VSEnvMap[] = 105, 114, 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, - 102, 120, 0, 67, 58, 92, + 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, @@ -209,7 +209,7 @@ const BYTE EnvironmentMapEffect_VSEnvMap[] = 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, - 120, 104, 0, 67, 58, 92, + 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb index 9aef45c8..93e5780c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc index eb015dd9..cbd71c62 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc @@ -47,16 +47,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c22.x, c22.y // ::BiasX2<0,1,2> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r1.x, r0, c15 dp3 r1.y, r0, c16 dp3 r1.z, r0, c17 nrm r0.xyz, r1 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, -c4, r0 // ::dotL<0> dp3 r1.y, -c5, r0 // ::dotL<1> dp3 r1.z, -c6, r0 // ::dotL<2> @@ -72,15 +72,15 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r1, r2, c3 // ::VSEnvMapBn<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c20 // ::VSEnvMapBn<15> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c11 max r0.w, r0.w, c22.z min oT1.w, r0.w, c22.w // ::VSEnvMapBn<7> -#line 65 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 65 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 r1.x, v0, c12 // ::pos_ws<0> dp4 r1.y, v0, c13 // ::pos_ws<1> dp4 r1.z, v0, c14 // ::pos_ws<2> @@ -101,10 +101,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapBn<13,14> mov oPos.w, r0.z // ::VSEnvMapBn<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapBn<3> -#line 77 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 77 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT1.xyz, c1.x // ::VSEnvMapBn<4,5,6> #line 125 @@ -163,10 +163,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapBn[] = { - 68, 88, 66, 67, 108, 21, - 54, 130, 39, 250, 26, 183, - 60, 1, 102, 83, 146, 124, - 236, 43, 1, 0, 0, 0, + 68, 88, 66, 67, 37, 21, + 3, 8, 98, 46, 89, 37, + 133, 199, 136, 19, 242, 251, + 199, 204, 1, 0, 0, 0, 240, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 208, 8, 0, 0, 216, 13, @@ -193,7 +193,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapBn[] = 0, 0, 39, 0, 0, 0, 224, 0, 0, 0, 11, 0, 0, 0, 208, 4, 0, 0, - 112, 2, 0, 0, 67, 58, + 112, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -202,7 +202,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -213,7 +213,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapBn[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb index d3d1510e..3370272a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc index 4559ddc1..56bcb9e3 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc @@ -47,13 +47,13 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, v1, c15 dp3 r0.y, v1, c16 dp3 r0.z, v1, c17 nrm r1.xyz, r0 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, -c4, r1 // ::dotL<0> dp3 r0.y, -c5, r1 // ::dotL<1> dp3 r0.z, -c6, r1 // ::dotL<2> @@ -69,7 +69,7 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r0, r2, c3 // ::VSEnvMapFresnel<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c20 // ::VSEnvMapFresnel<15> #line 65 @@ -87,12 +87,12 @@ pow r1.w, r0.x, c1.y mul oT1.xyz, r1.w, c1.x // ::VSEnvMapFresnel<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c11 max r0.x, r0.x, c22.x min oT1.w, r0.x, c22.y // ::VSEnvMapFresnel<7> -#line 81 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 81 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, -r2, r1 add r0.x, r0.x, r0.x mad oT3.xyz, r1, -r0.x, -r2 // ::VSEnvMapFresnel<10,11,12> @@ -106,10 +106,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapFresnel<13,14> mov oPos.w, r0.z // ::VSEnvMapFresnel<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapFresnel<3> -#line 132 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 132 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT2.xy, v2 // ::VSEnvMapFresnel<8,9> // approximately 45 instruction slots used @@ -170,10 +170,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = { - 68, 88, 66, 67, 75, 69, - 144, 119, 56, 31, 149, 31, - 194, 160, 187, 108, 124, 1, - 244, 145, 1, 0, 0, 0, + 68, 88, 66, 67, 239, 160, + 118, 122, 238, 72, 110, 8, + 232, 185, 219, 224, 46, 139, + 114, 136, 1, 0, 0, 0, 192, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 52, 9, 0, 0, 168, 14, @@ -200,7 +200,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = 0, 0, 43, 0, 0, 0, 224, 0, 0, 0, 11, 0, 0, 0, 248, 4, 0, 0, - 108, 2, 0, 0, 67, 58, + 108, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -211,7 +211,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = 105, 114, 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, - 102, 120, 0, 67, 58, 92, + 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, @@ -220,7 +220,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, - 120, 104, 0, 67, 58, 92, + 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb index 836793b3..b6806a7f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc index 23cc7a08..65a9d601 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc @@ -47,16 +47,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c22.x, c22.y // ::BiasX2<0,1,2> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r1.x, r0, c15 dp3 r1.y, r0, c16 dp3 r1.z, r0, c17 nrm r0.xyz, r1 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, -c4, r0 // ::dotL<0> dp3 r1.y, -c5, r0 // ::dotL<1> dp3 r1.z, -c6, r0 // ::dotL<2> @@ -72,7 +72,7 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r1, r2, c3 // ::VSEnvMapFresnelBn<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c20 // ::VSEnvMapFresnelBn<15> #line 65 @@ -90,12 +90,12 @@ pow r1.x, r0.w, c1.y mul oT1.xyz, r1.x, c1.x // ::VSEnvMapFresnelBn<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c11 max r0.w, r0.w, c22.z min oT1.w, r0.w, c22.w // ::VSEnvMapFresnelBn<7> -#line 81 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 81 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.w, -r2, r0 add r0.w, r0.w, r0.w mad oT3.xyz, r0, -r0.w, -r2 // ::VSEnvMapFresnelBn<10,11,12> @@ -109,10 +109,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapFresnelBn<13,14> mov oPos.w, r0.z // ::VSEnvMapFresnelBn<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapFresnelBn<3> -#line 139 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 139 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT2.xy, v2 // ::VSEnvMapFresnelBn<8,9> // approximately 46 instruction slots used @@ -174,10 +174,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = { - 68, 88, 66, 67, 37, 45, - 242, 60, 244, 75, 114, 166, - 152, 133, 37, 245, 122, 19, - 26, 13, 1, 0, 0, 0, + 68, 88, 66, 67, 17, 7, + 53, 143, 37, 54, 19, 163, + 242, 150, 177, 238, 89, 241, + 204, 64, 1, 0, 0, 0, 84, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 140, 9, 0, 0, 60, 15, @@ -204,7 +204,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = 0, 0, 44, 0, 0, 0, 224, 0, 0, 0, 12, 0, 0, 0, 40, 5, 0, 0, - 152, 2, 0, 0, 67, 58, + 152, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -213,7 +213,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -224,7 +224,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb index 53d33a13..e369b334 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.inc index 77241af8..9531b538 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.inc @@ -49,13 +49,13 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, v1, c11 dp3 r0.y, v1, c12 dp3 r0.z, v1, c13 nrm r1.xyz, r0 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, -c4, r1 // ::dotL<0> #line 39 @@ -67,15 +67,15 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r0, r2, c3 // ::VSEnvMapOneLight<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c16 // ::VSEnvMapOneLight<15> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c7 max r0.x, r0.x, c18.x min oT1.w, r0.x, c18.y // ::VSEnvMapOneLight<7> -#line 65 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 65 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 r0.x, v0, c8 // ::pos_ws<0> dp4 r0.y, v0, c9 // ::pos_ws<1> dp4 r0.z, v0, c10 // ::pos_ws<2> @@ -96,10 +96,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapOneLight<13,14> mov oPos.w, r0.z // ::VSEnvMapOneLight<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapOneLight<3> -#line 77 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 77 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT1.xyz, c1.x // ::VSEnvMapOneLight<4,5,6> #line 146 @@ -153,10 +153,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapOneLight[] = { - 68, 88, 66, 67, 73, 18, - 36, 222, 209, 122, 187, 83, - 15, 156, 35, 25, 149, 221, - 31, 144, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 207, + 231, 113, 126, 157, 69, 97, + 62, 18, 59, 149, 29, 174, + 232, 220, 1, 0, 0, 0, 80, 13, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 28, 8, 0, 0, 56, 12, @@ -187,7 +187,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLight[] = 0, 0, 34, 0, 0, 0, 224, 0, 0, 0, 10, 0, 0, 0, 116, 4, 0, 0, - 36, 2, 0, 0, 67, 58, + 36, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -198,7 +198,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLight[] = 105, 114, 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, - 102, 120, 0, 67, 58, 92, + 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, @@ -207,7 +207,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLight[] = 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, - 120, 104, 0, 67, 58, 92, + 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.pdb index a43c88fa..2cbf3fac 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLight.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.inc index 493f0cfa..9e89f8bb 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.inc @@ -49,16 +49,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c18.x, c18.y // ::BiasX2<0,1,2> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r1.x, r0, c11 dp3 r1.y, r0, c12 dp3 r1.z, r0, c13 nrm r0.xyz, r1 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.w, -c4, r0 // ::dotL<0> #line 39 @@ -70,15 +70,15 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r1, r2, c3 // ::VSEnvMapOneLightBn<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c16 // ::VSEnvMapOneLightBn<15> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c7 max r0.w, r0.w, c18.z min oT1.w, r0.w, c18.w // ::VSEnvMapOneLightBn<7> -#line 65 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 65 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 r1.x, v0, c8 // ::pos_ws<0> dp4 r1.y, v0, c9 // ::pos_ws<1> dp4 r1.z, v0, c10 // ::pos_ws<2> @@ -99,10 +99,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapOneLightBn<13,14> mov oPos.w, r0.z // ::VSEnvMapOneLightBn<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapOneLightBn<3> -#line 77 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 77 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT1.xyz, c1.x // ::VSEnvMapOneLightBn<4,5,6> #line 153 @@ -157,10 +157,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapOneLightBn[] = { - 68, 88, 66, 67, 182, 56, - 215, 178, 18, 70, 4, 246, - 253, 198, 38, 101, 115, 49, - 37, 242, 1, 0, 0, 0, + 68, 88, 66, 67, 5, 217, + 240, 246, 132, 191, 117, 213, + 190, 47, 46, 32, 37, 81, + 28, 127, 1, 0, 0, 0, 224, 13, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 112, 8, 0, 0, 200, 12, @@ -191,7 +191,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightBn[] = 0, 0, 35, 0, 0, 0, 224, 0, 0, 0, 11, 0, 0, 0, 160, 4, 0, 0, - 80, 2, 0, 0, 67, 58, + 80, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -200,7 +200,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -211,7 +211,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightBn[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.pdb index 5e47d32a..9d5f8876 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.inc index 9da467da..b21c1061 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.inc @@ -49,13 +49,13 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, v1, c11 dp3 r0.y, v1, c12 dp3 r0.z, v1, c13 nrm r1.xyz, r0 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.x, -c4, r1 // ::dotL<0> #line 39 @@ -67,7 +67,7 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r0, r2, c3 // ::VSEnvMapOneLightFresnel<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c16 // ::VSEnvMapOneLightFresnel<15> #line 65 @@ -85,12 +85,12 @@ pow r1.w, r0.x, c1.y mul oT1.xyz, r1.w, c1.x // ::VSEnvMapOneLightFresnel<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c7 max r0.x, r0.x, c18.x min oT1.w, r0.x, c18.y // ::VSEnvMapOneLightFresnel<7> -#line 81 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 81 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.x, -r2, r1 add r0.x, r0.x, r0.x mad oT3.xyz, r1, -r0.x, -r2 // ::VSEnvMapOneLightFresnel<10,11,12> @@ -104,10 +104,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapOneLightFresnel<13,14> mov oPos.w, r0.z // ::VSEnvMapOneLightFresnel<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapOneLightFresnel<3> -#line 160 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 160 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT2.xy, v2 // ::VSEnvMapOneLightFresnel<8,9> // approximately 41 instruction slots used @@ -164,10 +164,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnel[] = { - 68, 88, 66, 67, 57, 12, - 111, 205, 59, 159, 141, 229, - 239, 158, 199, 69, 94, 18, - 32, 137, 1, 0, 0, 0, + 68, 88, 66, 67, 141, 167, + 159, 153, 181, 0, 169, 174, + 55, 241, 42, 244, 81, 242, + 196, 233, 1, 0, 0, 0, 176, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 212, 8, 0, 0, 152, 13, @@ -198,7 +198,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnel[] = 0, 0, 39, 0, 0, 0, 224, 0, 0, 0, 11, 0, 0, 0, 200, 4, 0, 0, - 76, 2, 0, 0, 67, 58, + 76, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -209,7 +209,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnel[] = 105, 114, 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, - 102, 120, 0, 67, 58, 92, + 102, 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, @@ -218,7 +218,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnel[] = 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, - 120, 104, 0, 67, 58, 92, + 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.pdb index e92b188f..77f7e9a6 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnel.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.inc index c8623c98..aa09f794 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.inc @@ -49,16 +49,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c18.x, c18.y // ::BiasX2<0,1,2> -#line 67 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 67 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r1.x, r0, c11 dp3 r1.y, r0, c12 dp3 r1.z, r0, c13 nrm r0.xyz, r1 // ::worldNormal<0,1,2> -#line 36 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 36 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r0.w, -c4, r0 // ::dotL<0> #line 39 @@ -70,7 +70,7 @@ mov r2.xyz, c2 // Parameters::DiffuseColor<0,1,2> mad oT0.xyz, r1, r2, c3 // ::VSEnvMapOneLightFresnelBn<0,1,2> -#line 71 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 71 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp4 oPos.z, v0, c16 // ::VSEnvMapOneLightFresnelBn<15> #line 65 @@ -88,12 +88,12 @@ pow r1.x, r0.w, c1.y mul oT1.xyz, r1.x, c1.x // ::VSEnvMapOneLightFresnelBn<4,5,6> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.w, v0, c7 max r0.w, r0.w, c18.z min oT1.w, r0.w, c18.w // ::VSEnvMapOneLightFresnelBn<7> -#line 81 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 81 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" dp3 r0.w, -r2, r0 add r0.w, r0.w, r0.w mad oT3.xyz, r0, -r0.w, -r2 // ::VSEnvMapOneLightFresnelBn<10,11,12> @@ -107,10 +107,10 @@ mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapOneLightFresnelBn<13,14> mov oPos.w, r0.z // ::VSEnvMapOneLightFresnelBn<16> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c2.w // ::VSEnvMapOneLightFresnelBn<3> -#line 167 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 167 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mov oT2.xy, v2 // ::VSEnvMapOneLightFresnelBn<8,9> // approximately 42 instruction slots used @@ -168,10 +168,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnelBn[] = { - 68, 88, 66, 67, 224, 83, - 53, 41, 127, 171, 183, 101, - 173, 229, 4, 218, 105, 35, - 189, 152, 1, 0, 0, 0, + 68, 88, 66, 67, 54, 6, + 70, 64, 57, 216, 227, 114, + 16, 45, 10, 67, 106, 217, + 173, 146, 1, 0, 0, 0, 68, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 44, 9, 0, 0, 44, 14, @@ -202,7 +202,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnelBn[] = 0, 0, 40, 0, 0, 0, 224, 0, 0, 0, 12, 0, 0, 0, 248, 4, 0, 0, - 120, 2, 0, 0, 67, 58, + 120, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -211,7 +211,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnelBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -222,7 +222,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapOneLightFresnelBn[] = 111, 110, 109, 101, 110, 116, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, - 0, 67, 58, 92, 65, 84, + 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.pdb index 0177f6a2..ba8ba25b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc index 32b8fddc..e7d29df8 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc @@ -47,7 +47,7 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSEnvMapPixelLighting<15> dp4 oT1.x, v0, c3 // ::VSEnvMapPixelLighting<2> dp4 oT1.y, v0, c4 // ::VSEnvMapPixelLighting<3> @@ -59,17 +59,17 @@ rsq r0.w, r0.w mul oT2.xyz, r0.w, r0 // ::VSEnvMapPixelLighting<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT1.w, r0.x, c13.y // ::VSEnvMapPixelLighting<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 172 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 172 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapPixelLighting<13,14> mov oPos.w, r0.z // ::VSEnvMapPixelLighting<16> @@ -113,10 +113,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = { - 68, 88, 66, 67, 140, 182, - 187, 98, 105, 91, 14, 135, - 22, 6, 145, 203, 155, 45, - 50, 50, 1, 0, 0, 0, + 68, 88, 66, 67, 165, 93, + 169, 9, 82, 245, 78, 191, + 108, 160, 124, 86, 27, 228, + 110, 12, 1, 0, 0, 0, 220, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 60, 6, 0, 0, 196, 8, @@ -143,7 +143,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = 0, 0, 25, 0, 0, 0, 224, 0, 0, 0, 3, 0, 0, 0, 192, 3, 0, 0, - 168, 1, 0, 0, 67, 58, + 168, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -152,7 +152,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -161,7 +161,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb index 368ae7da..abfb1acc 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc index 0664920b..a3e06d82 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc @@ -47,16 +47,16 @@ dcl_texcoord1 v1 // vin<4,5,6> dcl_texcoord2 v2 // vin<7,8> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSEnvMapPixelLightingBn<15> dp4 oT1.x, v0, c3 // ::VSEnvMapPixelLightingBn<2> dp4 oT1.y, v0, c4 // ::VSEnvMapPixelLightingBn<3> dp4 oT1.z, v0, c5 // ::VSEnvMapPixelLightingBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -64,17 +64,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r1 // ::VSEnvMapPixelLightingBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT1.w, r0.x, c13.w // ::VSEnvMapPixelLightingBn<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 185 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" +#line 185 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\EnvironmentMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSEnvMapPixelLightingBn<13,14> mov oPos.w, r0.z // ::VSEnvMapPixelLightingBn<16> @@ -119,10 +119,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = { - 68, 88, 66, 67, 202, 231, - 192, 149, 56, 135, 214, 117, - 39, 48, 216, 45, 225, 12, - 241, 131, 1, 0, 0, 0, + 68, 88, 66, 67, 130, 72, + 210, 83, 9, 158, 122, 117, + 40, 157, 32, 38, 37, 54, + 84, 162, 1, 0, 0, 0, 112, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 148, 6, 0, 0, 88, 9, @@ -149,7 +149,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = 0, 0, 26, 0, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 240, 3, 0, 0, - 212, 1, 0, 0, 67, 58, + 212, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -158,7 +158,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -167,7 +167,7 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb index 92a650b7..59a30825 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc index c617ca45..34fcd772 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc @@ -50,7 +50,7 @@ dcl_2d s1 dcl_2d s2 -#line 150 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 150 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" texld r0, t0, s2 // BiasX2::x<0,1,2> #line 161 @@ -59,26 +59,26 @@ #line 157 texld r2, t0, s0 -#line 103 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 103 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" nrm r3.xyz, t2 // ::normal<0,1,2> nrm r4.xyz, t3 // ::tangent<0,1,2> mul r5.xyz, r3.zxyw, r4.yzxw mad r5.xyz, r3.yzxw, r4.zxyw, -r5 // ::binormal<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r0, c14.x, c14.y // ::BiasX2<0,1,2> -#line 108 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 108 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r5.xyz, r5, r0.y mad r4.xyz, r0.x, r4, r5 mad r0.xyz, r0.z, r3, r4 // ::PeturbNormal<0,1,2> -#line 147 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 147 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" add r3.xyz, -t1, c12 dp3 r0.w, r3, r3 rsq r0.w, r0.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r4.xyz, r3, r0.w, -c3 nrm r5.xyz, r4 // ::halfVectors<0,1,2> @@ -124,23 +124,23 @@ mad r3.xyz, r3.z, c11, r4 mul r3.xyz, r3, c2 // ::result<3,4,5> -#line 162 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 162 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul r1.xyz, r1, r3 // AddSpecular::specular<0,1,2> #line 157 mul r2, r2, t4 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r1.xyz, r1, r2.w -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r0.y, c7 mad r3.xyz, r0.x, c6, r3 mad r0.xyz, r0.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r2, r0, r1 // AddSpecular::color<0,1,2> #line 20 @@ -228,10 +228,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = { - 68, 88, 66, 67, 212, 40, - 233, 41, 18, 177, 16, 245, - 43, 6, 127, 25, 99, 109, - 176, 177, 1, 0, 0, 0, + 68, 88, 66, 67, 92, 136, + 124, 76, 81, 152, 24, 186, + 20, 34, 7, 99, 14, 151, + 28, 15, 1, 0, 0, 0, 96, 21, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 100, 12, 0, 0, 148, 20, @@ -256,7 +256,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = 0, 0, 220, 0, 0, 0, 21, 0, 0, 0, 48, 6, 0, 0, 44, 3, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -266,7 +266,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = 111, 114, 109, 97, 108, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -275,7 +275,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb index c891e8bd..df0d98ef 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc index f28a2c2e..7ce6436b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc @@ -50,7 +50,7 @@ dcl_2d s1 dcl_2d s2 -#line 127 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 127 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" texld r0, t0, s2 // BiasX2::x<0,1,2> #line 138 @@ -59,26 +59,26 @@ #line 134 texld r2, t0, s0 -#line 103 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 103 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" nrm r3.xyz, t2 // ::normal<0,1,2> nrm r4.xyz, t3 // ::tangent<0,1,2> mul r5.xyz, r3.zxyw, r4.yzxw mad r5.xyz, r3.yzxw, r4.zxyw, -r5 // ::binormal<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r0, c13.x, c13.y // ::BiasX2<0,1,2> -#line 108 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 108 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r5.xyz, r5, r0.y mad r4.xyz, r0.x, r4, r5 mad r0.xyz, r0.z, r3, r4 // ::PeturbNormal<0,1,2> -#line 124 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 124 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" add r3.xyz, -t1, c12 dp3 r0.w, r3, r3 rsq r0.w, r0.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r4.xyz, r3, r0.w, -c3 nrm r5.xyz, r4 // ::halfVectors<0,1,2> @@ -124,23 +124,23 @@ mad r3.xyz, r3.z, c11, r4 mul r3.xyz, r3, c2 // ::result<3,4,5> -#line 139 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 139 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul r1.xyz, r1, r3 // AddSpecular::specular<0,1,2> #line 134 mul r2, r2, t4 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r1.xyz, r1, r2.w -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r0.y, c7 mad r3.xyz, r0.x, c6, r3 mad r0.xyz, r0.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r2.xyz, r2, r0, r1 // AddSpecular::color<0,1,2> mov oC0, r2 // ::PSNormalPixelLightingTxNoFog<0,1,2,3> @@ -222,10 +222,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = { - 68, 88, 66, 67, 146, 97, - 141, 113, 209, 190, 175, 64, - 69, 118, 228, 133, 153, 112, - 128, 53, 1, 0, 0, 0, + 68, 88, 66, 67, 43, 10, + 12, 246, 153, 42, 43, 170, + 71, 234, 128, 11, 120, 181, + 221, 113, 1, 0, 0, 0, 184, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 12, 12, 0, 0, 236, 19, @@ -250,7 +250,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = 0, 0, 220, 0, 0, 0, 20, 0, 0, 0, 20, 6, 0, 0, 28, 3, 0, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -260,7 +260,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = 111, 114, 109, 97, 108, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, 120, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, @@ -269,7 +269,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb index ed0ff855..5da79c48 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc index f75f58d1..e9c19150 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc @@ -48,32 +48,32 @@ dcl_2d s0 dcl_2d s1 -#line 175 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 175 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" texld r0, t0, s1 // BiasX2::x<0,1,2> #line 182 texld r1, t0, s0 -#line 103 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 103 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" nrm r2.xyz, t2 // ::normal<0,1,2> nrm r3.xyz, t3 // ::tangent<0,1,2> mul r4.xyz, r2.zxyw, r3.yzxw mad r4.xyz, r2.yzxw, r3.zxyw, -r4 // ::binormal<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r0, c13.x, c13.y // ::BiasX2<0,1,2> -#line 108 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 108 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r4.xyz, r4, r0.y mad r3.xyz, r0.x, r3, r4 mad r0.xyz, r0.z, r2, r3 // ::PeturbNormal<0,1,2> -#line 172 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 172 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" add r2.xyz, -t1, c12 dp3 r0.w, r2, r2 rsq r0.w, r0.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r3.xyz, r2, r0.w, -c3 nrm r4.xyz, r3 // ::halfVectors<0,1,2> @@ -119,20 +119,20 @@ mad r2.xyz, r2.z, c11, r3 mul r2.xyz, r2, c2 // ::result<3,4,5> -#line 182 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 182 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul r1, r1, t4 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r2.xyz, r1.w, r2 -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r0.y, c7 mad r3.xyz, r0.x, c6, r3 mad r0.xyz, r0.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, r1, r0, r2 // AddSpecular::color<0,1,2> mov oC0, r1 // ::PSNormalPixelLightingTxNoFogSpec<0,1,2,3> @@ -211,10 +211,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = { - 68, 88, 66, 67, 44, 22, - 151, 100, 45, 165, 207, 54, - 127, 217, 93, 26, 32, 26, - 116, 203, 1, 0, 0, 0, + 68, 88, 66, 67, 69, 214, + 21, 31, 150, 104, 2, 169, + 247, 27, 46, 105, 10, 66, + 114, 133, 1, 0, 0, 0, 212, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 120, 11, 0, 0, 8, 19, @@ -238,7 +238,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = 58, 0, 0, 0, 220, 0, 0, 0, 18, 0, 0, 0, 216, 5, 0, 0, 4, 3, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -248,7 +248,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = 92, 78, 111, 114, 109, 97, 108, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -257,7 +257,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb index e273268c..f6d56596 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc index 5a013ef7..c6e6603b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc @@ -48,32 +48,32 @@ dcl_2d s0 dcl_2d s1 -#line 197 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 197 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" texld r0, t0, s1 // BiasX2::x<0,1,2> #line 204 texld r1, t0, s0 -#line 103 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 103 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" nrm r2.xyz, t2 // ::normal<0,1,2> nrm r3.xyz, t3 // ::tangent<0,1,2> mul r4.xyz, r2.zxyw, r3.yzxw mad r4.xyz, r2.yzxw, r3.zxyw, -r4 // ::binormal<0,1,2> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r0, c14.x, c14.y // ::BiasX2<0,1,2> -#line 108 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 108 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r4.xyz, r4, r0.y mad r3.xyz, r0.x, r3, r4 mad r0.xyz, r0.z, r2, r3 // ::PeturbNormal<0,1,2> -#line 194 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 194 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" add r2.xyz, -t1, c12 dp3 r0.w, r2, r2 rsq r0.w, r0.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r3.xyz, r2, r0.w, -c3 nrm r4.xyz, r3 // ::halfVectors<0,1,2> @@ -119,20 +119,20 @@ mad r2.xyz, r2.z, c11, r3 mul r2.xyz, r2, c2 // ::result<3,4,5> -#line 204 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 204 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul r1, r1, t4 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r2.xyz, r1.w, r2 -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r0.y, c7 mad r3.xyz, r0.x, c6, r3 mad r0.xyz, r0.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r0.xyz, r0, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, r1, r0, r2 // AddSpecular::color<0,1,2> #line 20 @@ -217,10 +217,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = { - 68, 88, 66, 67, 92, 4, - 29, 164, 223, 120, 15, 43, - 178, 89, 243, 252, 82, 138, - 242, 183, 1, 0, 0, 0, + 68, 88, 66, 67, 152, 197, + 236, 246, 59, 94, 220, 213, + 132, 181, 216, 21, 60, 106, + 24, 6, 1, 0, 0, 0, 128, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 212, 11, 0, 0, 180, 19, @@ -244,7 +244,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = 60, 0, 0, 0, 220, 0, 0, 0, 19, 0, 0, 0, 248, 5, 0, 0, 20, 3, - 0, 0, 67, 58, 92, 65, + 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -254,7 +254,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = 92, 78, 111, 114, 109, 97, 108, 77, 97, 112, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -263,7 +263,7 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb index 64573d27..160e0f15 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc index 95001b68..624e2394 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc @@ -50,7 +50,7 @@ dcl_texcoord2 v2 // vin<7,8,9,10> dcl_texcoord3 v3 // vin<11,12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSNormalPixelLightingTx<18> dp4 oT1.x, v0, c3 // ::VSNormalPixelLightingTx<2> dp4 oT1.y, v0, c4 // ::VSNormalPixelLightingTx<3> @@ -62,12 +62,12 @@ rsq r0.w, r0.w mul oT2.xyz, r0.w, r0 // ::VSNormalPixelLightingTx<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT1.w, r0.x, c13.y // ::VSNormalPixelLightingTx<5> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" dp3 r0.x, v2, c6 dp3 r0.y, v2, c7 dp3 r0.z, v2, c8 @@ -75,12 +75,12 @@ rsq r0.w, r0.w mul oT3.xyz, r0.w, r0 // ::VSNormalPixelLightingTx<9,10,11> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 45 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 45 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSNormalPixelLightingTx<16,17> mov oPos.w, r0.z // ::VSNormalPixelLightingTx<19> @@ -132,10 +132,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = { - 68, 88, 66, 67, 7, 229, - 106, 14, 48, 253, 93, 112, - 45, 217, 4, 176, 108, 117, - 49, 89, 1, 0, 0, 0, + 68, 88, 66, 67, 105, 76, + 54, 23, 118, 204, 221, 254, + 126, 97, 14, 255, 212, 183, + 61, 130, 1, 0, 0, 0, 180, 11, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 24, 7, 0, 0, 100, 10, @@ -162,7 +162,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = 0, 0, 32, 0, 0, 0, 220, 0, 0, 0, 3, 0, 0, 0, 52, 4, 0, 0, - 220, 1, 0, 0, 67, 58, + 220, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -171,7 +171,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -180,7 +180,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb index 2d626140..0db37701 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc index 413cc43e..0795363e 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc @@ -50,16 +50,16 @@ dcl_texcoord2 v2 // vin<7,8,9,10> dcl_texcoord3 v3 // vin<11,12> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSNormalPixelLightingTxBn<18> dp4 oT1.x, v0, c3 // ::VSNormalPixelLightingTxBn<2> dp4 oT1.y, v0, c4 // ::VSNormalPixelLightingTxBn<3> dp4 oT1.z, v0, c5 // ::VSNormalPixelLightingTxBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -67,7 +67,7 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r1 // ::VSNormalPixelLightingTxBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT1.w, r0.x, c13.w // ::VSNormalPixelLightingTxBn<5> @@ -75,7 +75,7 @@ #line 32 mad r0.xyz, v2, c13.x, c13.y // ::BiasX2<0,1,2> -#line 76 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 76 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -83,12 +83,12 @@ rsq r0.x, r0.x mul oT3.xyz, r0.x, r1 // ::VSNormalPixelLightingTxBn<9,10,11> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 61 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 61 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSNormalPixelLightingTxBn<16,17> mov oPos.w, r0.z // ::VSNormalPixelLightingTxBn<19> @@ -142,10 +142,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = { - 68, 88, 66, 67, 59, 250, - 191, 85, 213, 205, 123, 78, - 230, 231, 138, 157, 116, 102, - 154, 178, 1, 0, 0, 0, + 68, 88, 66, 67, 102, 250, + 27, 114, 84, 197, 47, 157, + 210, 131, 182, 39, 144, 30, + 28, 9, 1, 0, 0, 0, 168, 12, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 148, 7, 0, 0, 88, 11, @@ -172,7 +172,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = 0, 0, 34, 0, 0, 0, 220, 0, 0, 0, 4, 0, 0, 0, 116, 4, 0, 0, - 28, 2, 0, 0, 67, 58, + 28, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -181,7 +181,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -190,7 +190,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb index 04070658..3383db0b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc index 7c7b484d..0f8bd1ed 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc @@ -52,7 +52,7 @@ dcl_texcoord3 v3 // vin<11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSNormalPixelLightingTxVc<18> dp4 oT1.x, v0, c3 // ::VSNormalPixelLightingTxVc<2> dp4 oT1.y, v0, c4 // ::VSNormalPixelLightingTxVc<3> @@ -64,12 +64,12 @@ rsq r0.w, r0.w mul oT2.xyz, r0.w, r0 // ::VSNormalPixelLightingTxVc<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.x min oT1.w, r0.x, c13.y // ::VSNormalPixelLightingTxVc<5> -#line 91 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 91 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul oT4.w, v4.w, c1.w // ::VSNormalPixelLightingTxVc<15> #line 95 @@ -80,12 +80,12 @@ rsq r0.w, r0.w mul oT3.xyz, r0.w, r0 // ::VSNormalPixelLightingTxVc<9,10,11> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 83 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 83 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSNormalPixelLightingTxVc<16,17> mov oPos.w, r0.z // ::VSNormalPixelLightingTxVc<19> @@ -137,10 +137,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = { - 68, 88, 66, 67, 139, 231, - 108, 159, 210, 166, 72, 94, - 134, 214, 116, 166, 24, 202, - 50, 182, 1, 0, 0, 0, + 68, 88, 66, 67, 202, 140, + 200, 211, 216, 49, 196, 175, + 73, 118, 209, 174, 200, 176, + 38, 255, 1, 0, 0, 0, 20, 12, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 80, 7, 0, 0, 164, 10, @@ -167,7 +167,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = 0, 0, 33, 0, 0, 0, 220, 0, 0, 0, 3, 0, 0, 0, 100, 4, 0, 0, - 228, 1, 0, 0, 67, 58, + 228, 1, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -176,7 +176,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -185,7 +185,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb index c56e871e..a75a3981 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc index 594d5052..53dd209a 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc @@ -52,16 +52,16 @@ dcl_texcoord3 v3 // vin<11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 oPos.z, v0, c11 // ::VSNormalPixelLightingTxVcBn<18> dp4 oT1.x, v0, c3 // ::VSNormalPixelLightingTxVcBn<2> dp4 oT1.y, v0, c4 // ::VSNormalPixelLightingTxVcBn<3> dp4 oT1.z, v0, c5 // ::VSNormalPixelLightingTxVcBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v1, c13.x, c13.y // ::BiasX2<0,1,2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -69,18 +69,18 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r1 // ::VSNormalPixelLightingTxVcBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, v0, c2 max r0.x, r0.x, c13.z min oT1.w, r0.x, c13.w // ::VSNormalPixelLightingTxVcBn<5> -#line 110 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 110 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mul oT4.w, v4.w, c1.w // ::VSNormalPixelLightingTxVcBn<15> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, v2, c13.x, c13.y // ::BiasX2<0,1,2> -#line 116 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 116 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" dp3 r1.x, r0, c6 dp3 r1.y, r0, c7 dp3 r1.z, r0, c8 @@ -88,12 +88,12 @@ rsq r0.x, r0.x mul oT3.xyz, r0.x, r1 // ::VSNormalPixelLightingTxVcBn<9,10,11> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, v0, c9 // ::vout<0> dp4 r0.y, v0, c10 // ::vout<1> dp4 r0.z, v0, c12 // ::vout<3> -#line 100 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" +#line 100 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\NormalMapEffect.fx" mad oPos.xy, r0.z, c0, r0 // ::VSNormalPixelLightingTxVcBn<16,17> mov oPos.w, r0.z // ::VSNormalPixelLightingTxVcBn<19> @@ -147,10 +147,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = { - 68, 88, 66, 67, 124, 195, - 154, 154, 150, 250, 50, 7, - 179, 122, 225, 163, 79, 31, - 237, 52, 1, 0, 0, 0, + 68, 88, 66, 67, 69, 30, + 11, 56, 36, 34, 54, 128, + 166, 34, 219, 230, 145, 212, + 48, 44, 1, 0, 0, 0, 12, 13, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 208, 7, 0, 0, 156, 11, @@ -177,7 +177,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = 0, 0, 35, 0, 0, 0, 220, 0, 0, 0, 4, 0, 0, 0, 168, 4, 0, 0, - 36, 2, 0, 0, 67, 58, + 36, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -186,7 +186,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, - 102, 120, 104, 0, 67, 58, + 102, 120, 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -195,7 +195,7 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = 92, 83, 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb index e03d8f69..1fa20ea7 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc new file mode 100644 index 00000000..0fc2fb93 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc @@ -0,0 +1,136 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[32], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(15) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample r2.xyzw, r1.yzyy, t0.xyzw, s0 + mad r0.xyzw, cb0[r1.x + 16].xyzw, r2.xyzw, r0.xyzw + iadd r1.x, r1.x, l(1) +endloop +mov o0.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomBlur[] = +{ + 68, 88, 66, 67, 172, 241, + 144, 218, 164, 236, 105, 55, + 200, 120, 50, 4, 73, 105, + 155, 1, 1, 0, 0, 0, + 36, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 1, 0, 0, + 64, 0, 0, 0, 89, 0, + 0, 0, 89, 8, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 32, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 54, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 18, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 0, 48, 0, + 0, 1, 33, 0, 0, 7, + 34, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 15, 0, 0, 0, + 3, 0, 4, 3, 26, 0, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 9, 98, 0, + 16, 0, 1, 0, 0, 0, + 6, 17, 16, 0, 1, 0, + 0, 0, 6, 129, 32, 4, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 2, 0, 0, 0, + 150, 5, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 50, 0, 0, 12, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 6, 0, 0, + 0, 0, 16, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 2, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 30, 0, 0, 7, 18, 0, + 16, 0, 1, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 1, 0, 0, 0, 22, 0, + 0, 1, 54, 0, 0, 5, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb new file mode 100644 index 00000000..9f692b4e Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc new file mode 100644 index 00000000..3dc96ace --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc @@ -0,0 +1,173 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[19], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 r1.x, r0.xyzx, l(0.212500, 0.715400, 0.072100, 0.000000) +add r0.xyzw, r0.xyzw, -r1.xxxx +mad r0.xyzw, cb0[16].xxxx, r0.xyzw, r1.xxxx +mul r0.xyzw, r0.xyzw, cb0[17].xyzw +sample r1.xyzw, v1.xyxx, t1.xyzw, s0 +dp3 r2.x, r1.xyzx, l(0.212500, 0.715400, 0.072100, 0.000000) +add r1.xyzw, r1.xyzw, -r2.xxxx +mad r1.xyzw, cb0[16].yyyy, r1.xyzw, r2.xxxx +mul r1.xyzw, r1.xyzw, cb0[18].xyzw +mov_sat r2.xyzw, r1.xyzw +add r2.xyzw, -r2.xyzw, l(1.000000, 1.000000, 1.000000, 1.000000) +mad o0.xyzw, r0.xyzw, r2.xyzw, r1.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomCombine[] = +{ + 68, 88, 66, 67, 242, 178, + 55, 62, 204, 88, 89, 93, + 56, 103, 128, 16, 10, 110, + 154, 166, 1, 0, 0, 0, + 244, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 52, 2, 0, 0, + 64, 0, 0, 0, 141, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 19, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 1, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 3, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 18, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 154, 153, + 89, 62, 116, 36, 55, 63, + 42, 169, 147, 61, 0, 0, + 0, 0, 0, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 6, 0, + 16, 128, 65, 0, 0, 0, + 1, 0, 0, 0, 50, 0, + 0, 10, 242, 0, 16, 0, + 0, 0, 0, 0, 6, 128, + 32, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 6, 0, 16, 0, 1, 0, + 0, 0, 56, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, + 17, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 1, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 18, 0, 16, 0, + 2, 0, 0, 0, 70, 2, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 154, 153, + 89, 62, 116, 36, 55, 63, + 42, 169, 147, 61, 0, 0, + 0, 0, 0, 0, 0, 8, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 6, 0, + 16, 128, 65, 0, 0, 0, + 2, 0, 0, 0, 50, 0, + 0, 10, 242, 0, 16, 0, + 1, 0, 0, 0, 86, 133, + 32, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 70, 14, + 16, 0, 1, 0, 0, 0, + 6, 0, 16, 0, 2, 0, + 0, 0, 56, 0, 0, 8, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, + 18, 0, 0, 0, 54, 32, + 0, 5, 242, 0, 16, 0, + 2, 0, 0, 0, 70, 14, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 11, 242, 0, + 16, 0, 2, 0, 0, 0, + 70, 14, 16, 128, 65, 0, + 0, 0, 2, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 50, 0, 0, 9, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb new file mode 100644 index 00000000..2c2a8c6d Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc new file mode 100644 index 00000000..9f359dea --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc @@ -0,0 +1,109 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[17], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +add r0.xyzw, r0.xyzw, -cb0[16].xyzw +add r1.xyzw, -cb0[16].xyzw, l(1.000000, 1.000000, 1.000000, 1.000000) +div_sat o0.xyzw, r0.xyzw, r1.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomExtract[] = +{ + 68, 88, 66, 67, 171, 18, + 55, 97, 179, 14, 173, 230, + 133, 86, 96, 193, 26, 35, + 69, 7, 1, 0, 0, 0, + 172, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 236, 0, 0, 0, + 64, 0, 0, 0, 59, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 17, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 70, 142, 32, 128, + 65, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 0, 0, 0, 12, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 142, 32, 128, 65, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 128, 63, + 14, 32, 0, 7, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb new file mode 100644 index 00000000..ca6ec3d7 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.inc new file mode 100644 index 00000000..3e1851b7 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.inc @@ -0,0 +1,81 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +sample o0.xyzw, v1.xyxx, t0.xyzw, s0 +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSCopy[] = +{ + 68, 88, 66, 67, 108, 129, + 30, 239, 130, 190, 108, 21, + 28, 176, 127, 137, 202, 107, + 77, 84, 1, 0, 0, 0, + 36, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 0, 0, 0, + 64, 0, 0, 0, 25, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 69, 0, 0, 9, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.pdb new file mode 100644 index 00000000..3f2637bf Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSCopy.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc new file mode 100644 index 00000000..6680ce53 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc @@ -0,0 +1,136 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[5], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(4) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample r2.xyzw, r1.yzyy, t0.xyzw, s0 + add r0.xyzw, r0.xyzw, r2.xyzw + iadd r1.x, r1.x, l(1) +endloop +mul o0.xyzw, r0.xyzw, l(0.250000, 0.250000, 0.250000, 0.250000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSDownScale2x2[] = +{ + 68, 88, 66, 67, 7, 104, + 225, 181, 190, 194, 1, 95, + 237, 110, 147, 78, 75, 13, + 110, 60, 1, 0, 0, 0, + 36, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 1, 0, 0, + 64, 0, 0, 0, 89, 0, + 0, 0, 89, 8, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 54, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 18, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 0, 48, 0, + 0, 1, 33, 0, 0, 7, + 34, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 4, 0, 0, 0, + 3, 0, 4, 3, 26, 0, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 9, 98, 0, + 16, 0, 1, 0, 0, 0, + 6, 17, 16, 0, 1, 0, + 0, 0, 6, 129, 32, 4, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 2, 0, 0, 0, + 150, 5, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 7, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 2, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 22, 0, 0, 1, + 56, 0, 0, 10, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 128, 62, 0, 0, + 128, 62, 0, 0, 128, 62, + 0, 0, 128, 62, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb new file mode 100644 index 00000000..d3a471ea Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc new file mode 100644 index 00000000..9e95dc97 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc @@ -0,0 +1,136 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[16], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(16) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample r2.xyzw, r1.yzyy, t0.xyzw, s0 + add r0.xyzw, r0.xyzw, r2.xyzw + iadd r1.x, r1.x, l(1) +endloop +mul o0.xyzw, r0.xyzw, l(0.062500, 0.062500, 0.062500, 0.062500) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSDownScale4x4[] = +{ + 68, 88, 66, 67, 87, 14, + 245, 134, 119, 2, 187, 63, + 77, 159, 202, 100, 38, 237, + 73, 148, 1, 0, 0, 0, + 36, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 1, 0, 0, + 64, 0, 0, 0, 89, 0, + 0, 0, 89, 8, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 54, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 18, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 0, 48, 0, + 0, 1, 33, 0, 0, 7, + 34, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 16, 0, 0, 0, + 3, 0, 4, 3, 26, 0, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 9, 98, 0, + 16, 0, 1, 0, 0, 0, + 6, 17, 16, 0, 1, 0, + 0, 0, 6, 129, 32, 4, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 2, 0, 0, 0, + 150, 5, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 7, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 2, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 22, 0, 0, 1, + 56, 0, 0, 10, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 128, 61, 0, 0, + 128, 61, 0, 0, 128, 61, + 0, 0, 128, 61, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb new file mode 100644 index 00000000..06b05d07 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc new file mode 100644 index 00000000..55c29dfb --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc @@ -0,0 +1,136 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[30], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(13) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample r2.xyzw, r1.yzyy, t0.xyzw, s0 + mad r0.xyzw, cb0[r1.x + 16].xyzw, r2.xyzw, r0.xyzw + iadd r1.x, r1.x, l(1) +endloop +mov o0.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSGaussianBlur5x5[] = +{ + 68, 88, 66, 67, 144, 251, + 222, 235, 96, 204, 56, 54, + 127, 250, 246, 200, 224, 60, + 209, 131, 1, 0, 0, 0, + 36, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 1, 0, 0, + 64, 0, 0, 0, 89, 0, + 0, 0, 89, 8, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 30, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 54, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 18, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 0, 48, 0, + 0, 1, 33, 0, 0, 7, + 34, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 13, 0, 0, 0, + 3, 0, 4, 3, 26, 0, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 9, 98, 0, + 16, 0, 1, 0, 0, 0, + 6, 17, 16, 0, 1, 0, + 0, 0, 6, 129, 32, 4, + 0, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 2, 0, 0, 0, + 150, 5, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 50, 0, 0, 12, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 6, 0, 0, + 0, 0, 16, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 2, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 30, 0, 0, 7, 18, 0, + 16, 0, 1, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 1, 64, 0, 0, + 1, 0, 0, 0, 22, 0, + 0, 1, 54, 0, 0, 5, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb new file mode 100644 index 00000000..6a20a501 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.inc new file mode 100644 index 00000000..deac1642 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.inc @@ -0,0 +1,112 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[18], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t1.xyzw, s0 +mul r0.xyzw, r0.xyzw, cb0[17].xyzw +sample r1.xyzw, v1.xyxx, t0.xyzw, s0 +mad o0.xyzw, cb0[16].xyzw, r1.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSMerge[] = +{ + 68, 88, 66, 67, 111, 53, + 218, 89, 135, 6, 8, 132, + 24, 252, 103, 90, 171, 120, + 13, 182, 1, 0, 0, 0, + 184, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 248, 0, 0, 0, + 64, 0, 0, 0, 62, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 18, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 1, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 2, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 1, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 8, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 0, 0, 0, + 0, 0, 17, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 50, 0, 0, 10, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.pdb new file mode 100644 index 00000000..632abb3c Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMerge.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc new file mode 100644 index 00000000..f719f0a1 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc @@ -0,0 +1,95 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v1.xyxx, t0.xwyz, s0 +dp3 r0.x, r0.xzwx, l(0.212500, 0.715400, 0.072100, 0.000000) +mov o0.xyzw, r0.xxxy +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSMonochrome[] = +{ + 68, 88, 66, 67, 223, 136, + 63, 187, 209, 86, 5, 50, + 228, 92, 107, 23, 87, 189, + 42, 225, 1, 0, 0, 0, + 104, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 168, 0, 0, 0, + 64, 0, 0, 0, 42, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 9, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 198, 121, + 16, 0, 0, 0, 0, 0, + 0, 96, 16, 0, 0, 0, + 0, 0, 16, 0, 0, 10, + 18, 0, 16, 0, 0, 0, + 0, 0, 134, 3, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 154, 153, 89, 62, + 116, 36, 55, 63, 42, 169, + 147, 61, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, + 6, 4, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb new file mode 100644 index 00000000..a85d7548 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.inc new file mode 100644 index 00000000..44940c99 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.inc @@ -0,0 +1,111 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 o0.x, r0.xyzx, l(0.393000, 0.769000, 0.189000, 0.000000) +dp3 o0.y, r0.xyzx, l(0.349000, 0.686000, 0.168000, 0.000000) +dp3 o0.z, r0.xyzx, l(0.272000, 0.534000, 0.131000, 0.000000) +mov o0.w, r0.w +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSSepia[] = +{ + 68, 88, 66, 67, 128, 113, + 162, 217, 39, 7, 231, 30, + 114, 101, 237, 124, 70, 126, + 192, 247, 1, 0, 0, 0, + 184, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 248, 0, 0, 0, + 64, 0, 0, 0, 62, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 9, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, + 16, 0, 0, 0, 0, 0, + 0, 96, 16, 0, 0, 0, + 0, 0, 16, 0, 0, 10, + 18, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 76, 55, 201, 62, + 47, 221, 68, 63, 55, 137, + 65, 62, 0, 0, 0, 0, + 16, 0, 0, 10, 34, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 33, 176, 178, 62, 178, 157, + 47, 63, 49, 8, 44, 62, + 0, 0, 0, 0, 16, 0, + 0, 10, 66, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 150, 67, + 139, 62, 57, 180, 8, 63, + 221, 36, 6, 62, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.pdb new file mode 100644 index 00000000..5caf54ff Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_PSSepia.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.inc b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.inc new file mode 100644 index 00000000..dd02a2bd --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.inc @@ -0,0 +1,119 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_4_0 +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_VSQuad[] = +{ + 68, 88, 66, 67, 141, 120, + 239, 206, 52, 223, 131, 56, + 184, 188, 219, 176, 80, 69, + 20, 97, 1, 0, 0, 0, + 224, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 96, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 44, 0, 0, 0, 1, 0, + 0, 0, 8, 0, 0, 0, + 32, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 0, 0, + 83, 86, 95, 86, 101, 114, + 116, 101, 120, 73, 100, 0, + 79, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 12, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 83, 72, + 68, 82, 32, 1, 0, 0, + 64, 0, 1, 0, 72, 0, + 0, 0, 96, 0, 0, 4, + 18, 16, 16, 0, 0, 0, + 0, 0, 6, 0, 0, 0, + 103, 0, 0, 4, 242, 32, + 16, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, + 1, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 54, 0, 0, 8, 194, 32, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 128, 63, 1, 0, 0, 7, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 85, 0, 0, 7, 66, 0, + 16, 0, 0, 0, 0, 0, + 10, 16, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 1, 0, 0, 0, 86, 0, + 0, 5, 50, 0, 16, 0, + 0, 0, 0, 0, 134, 0, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 10, 194, 0, + 16, 0, 0, 0, 0, 0, + 6, 4, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 191, + 0, 0, 0, 191, 54, 0, + 0, 5, 50, 32, 16, 0, + 1, 0, 0, 0, 70, 0, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 7, 18, 32, + 16, 0, 0, 0, 0, 0, + 42, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 7, 34, 32, 16, 0, + 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, + 0, 192, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.pdb new file mode 100644 index 00000000..0edaa88d Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/PostProcess_VSQuad.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc index c18d1265..b334483d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc @@ -44,20 +44,20 @@ dcl t3 // pin<9,10,11,12> dcl_2d s0 -#line 379 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 379 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" texld r0, t0, s0 add r1.xyz, -t1, c12 dp3 r1.w, r1, r1 rsq r1.w, r1.w -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mad r2.xyz, r1, r1.w, -c3 nrm r3.xyz, r2 // ::halfVectors<0,1,2> -#line 382 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 382 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" nrm r2.xyz, t2 // ::worldNormal<0,1,2> -#line 37 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 37 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r3.x, r3, r2 // ::dotH<0> #line 33 @@ -99,20 +99,20 @@ mad r1.xyz, r1.z, c11, r3 mul r1.xyz, r1, c2 // ::result<3,4,5> -#line 379 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 379 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, r0, t3 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mul r1.xyz, r0.w, r1 -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mul r3.xyz, r2.y, c7 mad r3.xyz, r2.x, c6, r3 mad r2.xyz, r2.z, c8, r3 mov r3.xyz, c0 // Parameters::DiffuseColor<0,1,2> mad r2.xyz, r2, r3, c1 // ::result<0,1,2> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, r0, r2, r1 // AddSpecular::color<0,1,2> #line 20 @@ -185,10 +185,10 @@ ret const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = { - 68, 88, 66, 67, 103, 155, - 235, 137, 183, 8, 197, 19, - 255, 39, 245, 253, 138, 168, - 135, 16, 1, 0, 0, 0, + 68, 88, 66, 67, 58, 118, + 42, 165, 123, 218, 82, 67, + 110, 5, 134, 109, 101, 121, + 104, 101, 1, 0, 0, 0, 248, 16, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 212, 9, 0, 0, 68, 16, @@ -211,7 +211,7 @@ const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = 0, 0, 50, 0, 0, 0, 216, 0, 0, 0, 14, 0, 0, 0, 4, 5, 0, 0, - 156, 2, 0, 0, 67, 58, + 156, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -221,7 +221,7 @@ const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -230,7 +230,7 @@ const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb index d47faa23..e587ae5b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc index 761aed34..deffb7a1 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc @@ -41,11 +41,11 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 356 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 356 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" texld r0, t2, s0 mul r0, r0, t0 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> #line 20 @@ -75,10 +75,10 @@ ret const BYTE SkinnedEffect_PSSkinnedVertexLighting[] = { - 68, 88, 66, 67, 58, 43, - 131, 162, 242, 185, 252, 120, - 240, 91, 249, 248, 120, 50, - 223, 217, 1, 0, 0, 0, + 68, 88, 66, 67, 234, 26, + 225, 127, 143, 166, 116, 80, + 7, 5, 167, 201, 159, 0, + 41, 95, 1, 0, 0, 0, 108, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 144, 3, 0, 0, 208, 4, @@ -101,7 +101,7 @@ const BYTE SkinnedEffect_PSSkinnedVertexLighting[] = 0, 0, 10, 0, 0, 0, 160, 0, 0, 0, 5, 0, 0, 0, 240, 1, 0, 0, - 240, 0, 0, 0, 67, 58, + 240, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -111,7 +111,7 @@ const BYTE SkinnedEffect_PSSkinnedVertexLighting[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb index 9ce48328..c7a7377d 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc index d250eb11..57760ab4 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc @@ -34,11 +34,11 @@ dcl t2.xy // pin<8,9> dcl_2d s0 -#line 368 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 368 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" texld r0, t2, s0 mul r0, r0, t0 // ::color<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r0.xyz, t1, r0.w, r0 // AddSpecular::color<0,1,2> mov oC0, r0 // ::PSSkinnedVertexLightingNoFog<0,1,2,3> @@ -61,10 +61,10 @@ ret const BYTE SkinnedEffect_PSSkinnedVertexLightingNoFog[] = { - 68, 88, 66, 67, 85, 49, - 255, 177, 93, 213, 69, 72, - 206, 84, 68, 250, 209, 149, - 143, 1, 1, 0, 0, 0, + 68, 88, 66, 67, 50, 251, + 104, 54, 118, 231, 128, 2, + 155, 23, 217, 243, 213, 143, + 182, 136, 1, 0, 0, 0, 168, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 44, 3, 0, 0, 12, 4, @@ -85,7 +85,7 @@ const BYTE SkinnedEffect_PSSkinnedVertexLightingNoFog[] = 0, 0, 8, 0, 0, 0, 160, 0, 0, 0, 4, 0, 0, 0, 212, 1, 0, 0, - 224, 0, 0, 0, 67, 58, + 224, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -95,7 +95,7 @@ const BYTE SkinnedEffect_PSSkinnedVertexLightingNoFog[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb index 72416bb6..a457de91 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.inc index c7f15138..c6fb00a1 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.x mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -76,7 +76,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -122,24 +122,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightFourBones<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedOneLightFourBones<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 220 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 220 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightFourBones<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightFourBones<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightFourBones<3> -#line 224 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 224 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightFourBones<8,9> // approximately 64 instruction slots used @@ -219,10 +219,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightFourBones[] = { - 68, 88, 66, 67, 143, 156, - 157, 97, 77, 82, 112, 69, - 135, 246, 27, 14, 141, 236, - 225, 204, 1, 0, 0, 0, + 68, 88, 66, 67, 167, 52, + 58, 16, 93, 182, 59, 35, + 10, 21, 149, 26, 98, 26, + 69, 5, 1, 0, 0, 0, 64, 22, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 232, 12, 0, 0, 244, 20, @@ -245,7 +245,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBones[] = 0, 0, 62, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 248, 6, 0, 0, - 56, 3, 0, 0, 67, 58, + 56, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -255,7 +255,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -264,7 +264,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.pdb index 32139b6c..29305ab9 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.inc index 79df2b4f..e777da7b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.z mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -56,10 +56,10 @@ mad r0, c26[a0.z], v4.z, r1 // ::skinning<0,3,6,9> mad r0, c26[a0.w], v4.w, r0 // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -79,7 +79,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -125,24 +125,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightFourBonesBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedOneLightFourBonesBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 234 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 234 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightFourBonesBn<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightFourBonesBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightFourBonesBn<3> -#line 240 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 240 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightFourBonesBn<8,9> // approximately 65 instruction slots used @@ -223,10 +223,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightFourBonesBn[] = { - 68, 88, 66, 67, 37, 47, - 203, 47, 229, 122, 203, 6, - 108, 165, 205, 76, 175, 88, - 166, 229, 1, 0, 0, 0, + 68, 88, 66, 67, 250, 223, + 191, 129, 156, 89, 30, 52, + 197, 168, 252, 219, 234, 250, + 231, 203, 1, 0, 0, 0, 196, 22, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 48, 13, 0, 0, 120, 21, @@ -249,7 +249,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBonesBn[] = 0, 0, 63, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 24, 7, 0, 0, - 84, 3, 0, 0, 67, 58, + 84, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -259,7 +259,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -268,7 +268,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightFourBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.pdb index 8b559b53..6660c10f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightFourBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.inc index d2552051..ae9a61a7 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.x mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> @@ -67,7 +67,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -113,24 +113,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightOneBone<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedOneLightOneBone<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 157 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 157 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightOneBone<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightOneBone<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightOneBone<3> -#line 161 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 161 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightOneBone<8,9> // approximately 55 instruction slots used @@ -201,10 +201,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightOneBone[] = { - 68, 88, 66, 67, 219, 40, - 8, 6, 238, 115, 88, 74, - 127, 178, 117, 107, 62, 55, - 60, 69, 1, 0, 0, 0, + 68, 88, 66, 67, 84, 95, + 182, 133, 29, 218, 41, 83, + 216, 163, 154, 184, 83, 251, + 116, 229, 1, 0, 0, 0, 28, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 11, 0, 0, 208, 17, @@ -227,7 +227,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBone[] = 0, 0, 53, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 104, 6, 0, 0, - 240, 2, 0, 0, 67, 58, + 240, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -237,7 +237,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBone[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -246,7 +246,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBone[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.pdb index 59f14e8c..0e52e354 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBone.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.inc index 66d3986f..d1474f9d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.inc @@ -48,15 +48,15 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.z mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -70,7 +70,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -116,24 +116,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightOneBoneBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedOneLightOneBoneBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 171 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 171 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightOneBoneBn<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightOneBoneBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightOneBoneBn<3> -#line 177 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 177 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightOneBoneBn<8,9> // approximately 56 instruction slots used @@ -205,10 +205,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightOneBoneBn[] = { - 68, 88, 66, 67, 170, 19, - 175, 74, 68, 24, 124, 51, - 71, 160, 144, 181, 194, 47, - 125, 235, 1, 0, 0, 0, + 68, 88, 66, 67, 38, 141, + 33, 255, 195, 194, 32, 118, + 84, 57, 203, 73, 66, 150, + 202, 78, 1, 0, 0, 0, 156, 19, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 11, 0, 0, 80, 18, @@ -231,7 +231,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBoneBn[] = 0, 0, 54, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 132, 6, 0, 0, - 12, 3, 0, 0, 67, 58, + 12, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -241,7 +241,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBoneBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -250,7 +250,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightOneBoneBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.pdb index d55651a4..8292aa0c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightOneBoneBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.inc index 9c59f5e1..0d2d3d1b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.x mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] @@ -70,7 +70,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -116,24 +116,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightTwoBones<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedOneLightTwoBones<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 189 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 189 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightTwoBones<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightTwoBones<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightTwoBones<3> -#line 193 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 193 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightTwoBones<8,9> // approximately 58 instruction slots used @@ -207,10 +207,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightTwoBones[] = { - 68, 88, 66, 67, 8, 220, - 228, 240, 202, 179, 167, 23, - 232, 175, 120, 96, 172, 143, - 200, 23, 1, 0, 0, 0, + 68, 88, 66, 67, 83, 213, + 220, 71, 221, 44, 158, 149, + 21, 4, 143, 113, 221, 117, + 226, 235, 1, 0, 0, 0, 24, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 224, 11, 0, 0, 204, 18, @@ -233,7 +233,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBones[] = 0, 0, 56, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 128, 6, 0, 0, - 8, 3, 0, 0, 67, 58, + 8, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -243,7 +243,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -252,7 +252,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.pdb index c0cb857d..75d64a84 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.inc index 41c48073..52c005be 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.inc @@ -48,16 +48,16 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.z mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] mad r0, c26[a0.y], v4.x, r0 // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -73,7 +73,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -119,24 +119,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedOneLightTwoBonesBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedOneLightTwoBonesBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 203 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 203 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedOneLightTwoBonesBn<10,11> mov oPos.w, r0.x // ::VSSkinnedOneLightTwoBonesBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedOneLightTwoBonesBn<3> -#line 209 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 209 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedOneLightTwoBonesBn<8,9> // approximately 59 instruction slots used @@ -211,10 +211,10 @@ ret const BYTE SkinnedEffect_VSSkinnedOneLightTwoBonesBn[] = { - 68, 88, 66, 67, 246, 249, - 70, 90, 231, 14, 154, 54, - 181, 28, 199, 6, 153, 68, - 63, 186, 1, 0, 0, 0, + 68, 88, 66, 67, 182, 214, + 10, 190, 65, 147, 158, 102, + 39, 101, 57, 140, 18, 67, + 205, 125, 1, 0, 0, 0, 152, 20, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 36, 12, 0, 0, 76, 19, @@ -237,7 +237,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBonesBn[] = 0, 0, 57, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 156, 6, 0, 0, - 36, 3, 0, 0, 67, 58, + 36, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -247,7 +247,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -256,7 +256,7 @@ const BYTE SkinnedEffect_VSSkinnedOneLightTwoBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.pdb index 69aac272..9c71a7c3 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedOneLightTwoBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc index 6c0507a7..5319a548 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc @@ -49,7 +49,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.x mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -77,7 +77,7 @@ dp4 r1.z, v0, r3 // Skin::vin<2> dp3 r0.z, v1, r3 // ::Skin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingFourBones<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingFourBones<2> @@ -90,17 +90,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingFourBones<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.y min oT1.w, r0.x, c243.z // ::VSSkinnedPixelLightingFourBones<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 320 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 320 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingFourBones<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingFourBones<16> @@ -168,10 +168,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = { - 68, 88, 66, 67, 186, 35, - 157, 135, 126, 57, 191, 127, - 163, 215, 198, 196, 67, 221, - 44, 30, 1, 0, 0, 0, + 68, 88, 66, 67, 46, 224, + 168, 212, 3, 159, 15, 211, + 122, 224, 66, 75, 2, 104, + 43, 223, 1, 0, 0, 0, 20, 17, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 0, 10, 0, 0, 176, 15, @@ -194,7 +194,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = 0, 0, 48, 0, 0, 0, 216, 0, 0, 0, 6, 0, 0, 0, 172, 5, 0, 0, - 148, 2, 0, 0, 67, 58, + 148, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -204,7 +204,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -213,7 +213,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb index d834021c..0dfc8d4a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc index cc912802..8b6d4b07 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc @@ -50,7 +50,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.z mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -75,22 +75,22 @@ dp4 r1.y, v0, r2 // Skin::vin<1> dp4 r1.z, v0, r3 // Skin::vin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingFourBonesBn<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingFourBonesBn<2> dp4 oT1.y, r1, c16 // ::VSSkinnedPixelLightingFourBonesBn<3> dp4 oT1.z, r1, c17 // ::VSSkinnedPixelLightingFourBonesBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r4.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r0.x, r4, r0 // ::Skin<0> dp3 r0.y, r4, r2 // ::Skin<1> dp3 r0.z, r4, r3 // ::Skin<2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r0, c19 dp3 r2.y, r0, c20 dp3 r2.z, r0, c21 @@ -98,17 +98,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingFourBonesBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.w min oT1.w, r0.x, -c243.y // ::VSSkinnedPixelLightingFourBonesBn<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 335 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 335 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingFourBonesBn<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingFourBonesBn<16> @@ -177,10 +177,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = { - 68, 88, 66, 67, 128, 1, - 30, 235, 33, 109, 10, 41, - 112, 99, 106, 167, 215, 0, - 223, 215, 1, 0, 0, 0, + 68, 88, 66, 67, 217, 60, + 255, 183, 236, 156, 124, 64, + 23, 215, 153, 243, 178, 169, + 146, 141, 1, 0, 0, 0, 180, 17, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 100, 10, 0, 0, 80, 16, @@ -203,7 +203,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = 0, 0, 50, 0, 0, 0, 216, 0, 0, 0, 7, 0, 0, 0, 208, 5, 0, 0, - 184, 2, 0, 0, 67, 58, + 184, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -213,7 +213,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -222,7 +222,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb index aba4c2e7..95d9de0f 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc index 0392839d..00a4fc85 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc @@ -49,7 +49,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.x mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> @@ -68,7 +68,7 @@ dp4 r1.z, v0, r3 // Skin::vin<2> dp3 r0.z, v1, r3 // ::Skin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingOneBone<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingOneBone<2> @@ -81,17 +81,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingOneBone<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.y min oT1.w, r0.x, c243.z // ::VSSkinnedPixelLightingOneBone<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 252 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 252 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingOneBone<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingOneBone<16> @@ -150,10 +150,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = { - 68, 88, 66, 67, 104, 21, - 253, 85, 226, 238, 80, 33, - 73, 132, 93, 37, 165, 156, - 235, 77, 1, 0, 0, 0, + 68, 88, 66, 67, 75, 99, + 161, 179, 52, 23, 21, 179, + 203, 196, 143, 169, 255, 104, + 139, 237, 1, 0, 0, 0, 236, 13, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 148, 8, 0, 0, 136, 12, @@ -176,7 +176,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = 0, 0, 39, 0, 0, 0, 216, 0, 0, 0, 6, 0, 0, 0, 24, 5, 0, 0, - 76, 2, 0, 0, 67, 58, + 76, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -186,7 +186,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -195,7 +195,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb index 416df3ee..e17daf05 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc index 915e0994..dc846efe 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc @@ -50,7 +50,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.z mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> @@ -66,22 +66,22 @@ dp4 r1.y, v0, r2 // Skin::vin<1> dp4 r1.z, v0, r3 // Skin::vin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingOneBoneBn<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingOneBoneBn<2> dp4 oT1.y, r1, c16 // ::VSSkinnedPixelLightingOneBoneBn<3> dp4 oT1.z, r1, c17 // ::VSSkinnedPixelLightingOneBoneBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r4.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r0.x, r4, r0 // ::Skin<0> dp3 r0.y, r4, r2 // ::Skin<1> dp3 r0.z, r4, r3 // ::Skin<2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r0, c19 dp3 r2.y, r0, c20 dp3 r2.z, r0, c21 @@ -89,17 +89,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingOneBoneBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.w min oT1.w, r0.x, -c243.y // ::VSSkinnedPixelLightingOneBoneBn<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 267 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 267 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingOneBoneBn<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingOneBoneBn<16> @@ -159,10 +159,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = { - 68, 88, 66, 67, 229, 157, - 157, 7, 63, 74, 24, 219, - 36, 231, 48, 36, 148, 29, - 193, 54, 1, 0, 0, 0, + 68, 88, 66, 67, 127, 83, + 96, 82, 178, 134, 138, 7, + 205, 213, 162, 140, 102, 208, + 170, 58, 1, 0, 0, 0, 144, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 252, 8, 0, 0, 44, 13, @@ -185,7 +185,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = 0, 0, 41, 0, 0, 0, 216, 0, 0, 0, 7, 0, 0, 0, 64, 5, 0, 0, - 112, 2, 0, 0, 67, 58, + 112, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -195,7 +195,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -204,7 +204,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb index 3aa83260..2cb7356c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc index 6f05e7e6..0adc24b1 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc @@ -49,7 +49,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.x mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] @@ -71,7 +71,7 @@ dp4 r1.z, v0, r3 // Skin::vin<2> dp3 r0.z, v1, r3 // ::Skin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingTwoBones<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingTwoBones<2> @@ -84,17 +84,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingTwoBones<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.y min oT1.w, r0.x, c243.z // ::VSSkinnedPixelLightingTwoBones<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 286 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 286 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingTwoBones<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingTwoBones<16> @@ -156,10 +156,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = { - 68, 88, 66, 67, 47, 201, - 41, 73, 78, 183, 24, 39, - 126, 166, 18, 186, 33, 16, - 42, 96, 1, 0, 0, 0, + 68, 88, 66, 67, 40, 233, + 45, 103, 38, 10, 193, 236, + 41, 41, 123, 154, 114, 218, + 133, 68, 1, 0, 0, 0, 244, 14, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 0, 9, 0, 0, 144, 13, @@ -182,7 +182,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = 0, 0, 42, 0, 0, 0, 216, 0, 0, 0, 6, 0, 0, 0, 60, 5, 0, 0, - 100, 2, 0, 0, 67, 58, + 100, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -192,7 +192,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -201,7 +201,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb index 37f0da14..a360d03a 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc index 49133529..0bffea65 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc @@ -50,7 +50,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.z mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] @@ -69,22 +69,22 @@ dp4 r1.y, v0, r2 // Skin::vin<1> dp4 r1.z, v0, r3 // Skin::vin<2> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov r1.w, v0.w dp4 oPos.z, r1, c24 // ::VSSkinnedPixelLightingTwoBonesBn<15> dp4 oT1.x, r1, c15 // ::VSSkinnedPixelLightingTwoBonesBn<2> dp4 oT1.y, r1, c16 // ::VSSkinnedPixelLightingTwoBonesBn<3> dp4 oT1.z, r1, c17 // ::VSSkinnedPixelLightingTwoBonesBn<4> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r4.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r0.x, r4, r0 // ::Skin<0> dp3 r0.y, r4, r2 // ::Skin<1> dp3 r0.z, r4, r3 // ::Skin<2> -#line 87 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 87 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r0, c19 dp3 r2.y, r0, c20 dp3 r2.z, r0, c21 @@ -92,17 +92,17 @@ rsq r0.x, r0.x mul oT2.xyz, r0.x, r2 // ::VSSkinnedPixelLightingTwoBonesBn<6,7,8> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r0.x, r1, c14 max r0.x, r0.x, c243.w min oT1.w, r0.x, -c243.y // ::VSSkinnedPixelLightingTwoBonesBn<5> -#line 85 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 85 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r0.x, r1, c22 // ::vout<0> dp4 r0.y, r1, c23 // ::vout<1> dp4 r0.z, r1, c25 // ::vout<3> -#line 301 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 301 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.z, c242, r0 // ::VSSkinnedPixelLightingTwoBonesBn<13,14> mov oPos.w, r0.z // ::VSSkinnedPixelLightingTwoBonesBn<16> @@ -165,10 +165,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = { - 68, 88, 66, 67, 44, 208, - 246, 255, 21, 36, 154, 177, - 119, 164, 248, 49, 247, 57, - 26, 234, 1, 0, 0, 0, + 68, 88, 66, 67, 51, 179, + 103, 118, 54, 99, 51, 45, + 55, 19, 55, 100, 83, 169, + 19, 222, 1, 0, 0, 0, 140, 15, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 92, 9, 0, 0, 40, 14, @@ -191,7 +191,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = 0, 0, 44, 0, 0, 0, 216, 0, 0, 0, 7, 0, 0, 0, 88, 5, 0, 0, - 136, 2, 0, 0, 67, 58, + 136, 2, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -201,7 +201,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -210,7 +210,7 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb index 5b9787b9..36a1b456 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc index 3d7dfa62..2f19e337 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.x mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -76,7 +76,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -148,24 +148,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingFourBones<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedVertexLightingFourBones<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 125 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 125 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingFourBones<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingFourBones<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingFourBones<3> -#line 129 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 129 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingFourBones<8,9> // approximately 84 instruction slots used @@ -261,10 +261,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = { - 68, 88, 66, 67, 44, 136, - 5, 145, 169, 199, 10, 220, - 209, 36, 19, 64, 212, 74, - 254, 160, 1, 0, 0, 0, + 68, 88, 66, 67, 142, 84, + 168, 49, 218, 156, 9, 223, + 84, 173, 80, 229, 90, 53, + 51, 215, 1, 0, 0, 0, 100, 26, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 216, 14, 0, 0, 24, 25, @@ -287,7 +287,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = 0, 0, 80, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 216, 7, 0, 0, - 200, 3, 0, 0, 67, 58, + 200, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -297,7 +297,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -306,7 +306,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb index 27b80997..02bb4dd0 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc index 41ea9df0..1de7de04 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0, v3, c243.z mova a0, r0.yxzw mul r1, v4.y, c26[a0.x] @@ -56,10 +56,10 @@ mad r0, c26[a0.z], v4.z, r1 // ::skinning<0,3,6,9> mad r0, c26[a0.w], v4.w, r0 // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -79,7 +79,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -151,24 +151,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingFourBonesBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedVertexLightingFourBonesBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 139 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 139 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingFourBonesBn<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingFourBonesBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingFourBonesBn<3> -#line 145 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 145 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingFourBonesBn<8,9> // approximately 85 instruction slots used @@ -265,10 +265,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = { - 68, 88, 66, 67, 178, 45, - 235, 201, 249, 123, 129, 246, - 125, 87, 173, 223, 41, 191, - 190, 179, 1, 0, 0, 0, + 68, 88, 66, 67, 15, 116, + 38, 100, 240, 98, 89, 135, + 23, 86, 102, 112, 141, 84, + 182, 226, 1, 0, 0, 0, 228, 26, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 28, 15, 0, 0, 152, 25, @@ -291,7 +291,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = 0, 0, 81, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 244, 7, 0, 0, - 228, 3, 0, 0, 67, 58, + 228, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -301,7 +301,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -310,7 +310,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb index ae099a01..9a4045ae 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc index e151ef8d..ee89b48d 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.x mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> @@ -67,7 +67,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -139,24 +139,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingOneBone<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedVertexLightingOneBone<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 61 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 61 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingOneBone<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingOneBone<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingOneBone<3> -#line 65 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 65 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingOneBone<8,9> // approximately 75 instruction slots used @@ -243,10 +243,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = { - 68, 88, 66, 67, 123, 148, - 77, 68, 83, 228, 44, 189, - 213, 145, 13, 28, 205, 170, - 26, 48, 1, 0, 0, 0, + 68, 88, 66, 67, 62, 73, + 119, 200, 69, 171, 153, 69, + 17, 172, 31, 162, 40, 108, + 125, 176, 1, 0, 0, 0, 60, 23, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 108, 13, 0, 0, 240, 21, @@ -269,7 +269,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = 0, 0, 71, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 68, 7, 0, 0, - 128, 3, 0, 0, 67, 58, + 128, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -279,7 +279,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -288,7 +288,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb index 3e8a791c..c538120b 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc index 104f10df..7a8ff7a0 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc @@ -48,15 +48,15 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.x, v3.x, c243.z mova a0.x, r0.x mul r0, v4.x, c26[a0.x] // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -70,7 +70,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -142,24 +142,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingOneBoneBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedVertexLightingOneBoneBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 75 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 75 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingOneBoneBn<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingOneBoneBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingOneBoneBn<3> -#line 81 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 81 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingOneBoneBn<8,9> // approximately 76 instruction slots used @@ -247,10 +247,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = { - 68, 88, 66, 67, 201, 147, - 52, 86, 18, 16, 201, 155, - 246, 40, 156, 93, 173, 70, - 48, 151, 1, 0, 0, 0, + 68, 88, 66, 67, 65, 251, + 101, 218, 105, 113, 247, 38, + 31, 147, 103, 77, 230, 2, + 160, 244, 1, 0, 0, 0, 192, 23, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 180, 13, 0, 0, 116, 22, @@ -273,7 +273,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = 0, 0, 72, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 100, 7, 0, 0, - 156, 3, 0, 0, 67, 58, + 156, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -283,7 +283,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -292,7 +292,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb index b1e28472..c53cef43 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc index b5fc36fb..53f3b79f 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc @@ -48,7 +48,7 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.x mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] @@ -70,7 +70,7 @@ dp3 r1.z, v1, r3 // ::Skin<2> dp4 r0.z, v0, r3 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r2.x, r1, c19 dp3 r2.y, r1, c20 dp3 r2.z, r1, c21 @@ -142,24 +142,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingTwoBones<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.y min oT1.w, r1.x, c243.z // ::VSSkinnedVertexLightingTwoBones<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 93 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 93 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingTwoBones<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingTwoBones<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingTwoBones<3> -#line 97 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 97 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingTwoBones<8,9> // approximately 78 instruction slots used @@ -249,10 +249,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = { - 68, 88, 66, 67, 156, 55, - 247, 53, 140, 24, 108, 59, - 176, 204, 143, 253, 192, 249, - 19, 158, 1, 0, 0, 0, + 68, 88, 66, 67, 90, 254, + 49, 209, 123, 245, 67, 35, + 225, 17, 3, 210, 88, 192, + 38, 213, 1, 0, 0, 0, 56, 24, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 204, 13, 0, 0, 236, 22, @@ -275,7 +275,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = 0, 0, 74, 0, 0, 0, 216, 0, 0, 0, 16, 0, 0, 0, 92, 7, 0, 0, - 152, 3, 0, 0, 67, 58, + 152, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -285,7 +285,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -294,7 +294,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = 104, 97, 100, 101, 114, 115, 92, 76, 105, 103, 104, 116, 105, 110, 103, 46, 102, 120, - 104, 0, 67, 58, 92, 65, + 104, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb index 83c31b2f..4c0d7ddd 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc index be3c8b98..88c83f11 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc @@ -48,16 +48,16 @@ dcl_texcoord3 v3 // vin<9,10,11,12> dcl_texcoord4 v4 // vin<13,14,15,16> -#line 52 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 52 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mul r0.xy, v3, c243.z mova a0.xy, r0.yxzw mul r0, v4.y, c26[a0.x] mad r0, c26[a0.y], v4.x, r0 // ::skinning<0,3,6,9> -#line 32 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 32 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" mad r1.xyz, v1, c243.x, c243.y // ::BiasX2<0,1,2> -#line 56 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 56 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" dp3 r2.x, r1, r0 // ::Skin<0> dp4 r0.x, v0, r0 // Skin::vin<0> @@ -73,7 +73,7 @@ dp3 r2.z, r1, r4 // ::Skin<2> dp4 r0.z, v0, r4 // Skin::vin<2> -#line 59 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 59 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp3 r1.x, r2, c19 dp3 r1.y, r2, c20 dp3 r1.z, r2, c21 @@ -145,24 +145,24 @@ #line 63 dp4 oPos.z, r0, c24 // ::VSSkinnedVertexLightingTwoBonesBn<12> -#line 14 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" +#line 14 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Common.fxh" dp4 r1.x, r0, c14 max r1.x, r1.x, c243.w min oT1.w, r1.x, -c243.y // ::VSSkinnedVertexLightingTwoBonesBn<7> -#line 63 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 63 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" dp4 r1.x, r0, c22 // ::vout<0> dp4 r1.y, r0, c23 // ::vout<1> dp4 r0.x, r0, c25 // ::vout<3> -#line 107 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 107 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mad oPos.xy, r0.x, c242, r1 // ::VSSkinnedVertexLightingTwoBonesBn<10,11> mov oPos.w, r0.x // ::VSSkinnedVertexLightingTwoBonesBn<13> -#line 46 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" +#line 46 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\Lighting.fxh" mov oT0.w, c0.w // ::VSSkinnedVertexLightingTwoBonesBn<3> -#line 113 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" +#line 113 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SkinnedEffect.fx" mov oT2.xy, v2 // ::VSSkinnedVertexLightingTwoBonesBn<8,9> // approximately 79 instruction slots used @@ -253,10 +253,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = { - 68, 88, 66, 67, 57, 240, - 229, 127, 74, 91, 231, 194, - 182, 95, 144, 90, 179, 184, - 240, 12, 1, 0, 0, 0, + 68, 88, 66, 67, 161, 205, + 179, 225, 235, 126, 121, 115, + 79, 72, 151, 135, 10, 181, + 151, 202, 1, 0, 0, 0, 188, 24, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 20, 14, 0, 0, 112, 23, @@ -279,7 +279,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = 0, 0, 75, 0, 0, 0, 216, 0, 0, 0, 17, 0, 0, 0, 124, 7, 0, 0, - 180, 3, 0, 0, 67, 58, + 180, 3, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, @@ -289,7 +289,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = 114, 115, 92, 83, 107, 105, 110, 110, 101, 100, 69, 102, 102, 101, 99, 116, 46, 102, - 120, 0, 67, 58, 92, 65, + 120, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, @@ -298,7 +298,7 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = 104, 97, 100, 101, 114, 115, 92, 67, 111, 109, 109, 111, 110, 46, 102, 120, 104, 0, - 67, 58, 92, 65, 84, 71, + 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, 105, 114, 101, 99, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb index 82d10ac6..6305bc0c 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc index eb15d4aa..e1bc0b1b 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc @@ -32,7 +32,7 @@ dcl t1.xy // texCoord<0,1> dcl_2d s0 -#line 33 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SpriteEffect.fx" +#line 33 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SpriteEffect.fx" texld r0, t1, s0 mul r0, r0, t0 // ::SpritePixelShader<0,1,2,3> mov oC0, r0 // ::SpritePixelShader<0,1,2,3> @@ -53,10 +53,10 @@ ret const BYTE SpriteEffect_SpritePixelShader[] = { - 68, 88, 66, 67, 4, 30, - 13, 204, 127, 112, 3, 155, - 122, 165, 218, 50, 205, 136, - 180, 82, 1, 0, 0, 0, + 68, 88, 66, 67, 164, 153, + 88, 162, 177, 12, 72, 106, + 69, 234, 253, 231, 239, 171, + 11, 175, 1, 0, 0, 0, 100, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 68, 2, 0, 0, 224, 2, @@ -77,7 +77,7 @@ const BYTE SpriteEffect_SpritePixelShader[] = 0, 0, 6, 0, 0, 0, 104, 0, 0, 0, 3, 0, 0, 0, 32, 1, 0, 0, - 152, 0, 0, 0, 67, 58, + 152, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb index b4c51117..77dcb97d 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc index 857ee671..847fed98 100644 --- a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc +++ b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc @@ -42,7 +42,7 @@ dcl_texcoord1 v1 // texCoord<0,1> dcl_texcoord2 v2 // position<0,1,2,3> -#line 26 "C:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SpriteEffect.fx" +#line 26 "D:\ATG\st_dev\Kits\DirectXTK\Src\Shaders\SpriteEffect.fx" mul r0, v2.y, c2 mad r0, v2.x, c1, r0 mad r0, v2.z, c3, r0 @@ -74,10 +74,10 @@ ret const BYTE SpriteEffect_SpriteVertexShader[] = { - 68, 88, 66, 67, 58, 49, - 95, 78, 240, 23, 233, 35, - 191, 113, 38, 196, 211, 226, - 3, 180, 1, 0, 0, 0, + 68, 88, 66, 67, 195, 18, + 99, 240, 134, 203, 128, 31, + 15, 158, 162, 178, 130, 214, + 39, 200, 1, 0, 0, 0, 28, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 252, 2, 0, 0, 52, 4, @@ -100,7 +100,7 @@ const BYTE SpriteEffect_SpriteVertexShader[] = 0, 0, 11, 0, 0, 0, 104, 0, 0, 0, 3, 0, 0, 0, 116, 1, 0, 0, - 192, 0, 0, 0, 67, 58, + 192, 0, 0, 0, 68, 58, 92, 65, 84, 71, 92, 115, 116, 95, 100, 101, 118, 92, 75, 105, 116, 115, 92, 68, diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb index 0f41a46d..325ec815 100644 Binary files a/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb and b/Kits/DirectXTK/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc new file mode 100644 index 00000000..0865bb4f --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc @@ -0,0 +1,140 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +mad r1.xyz, r0.xyzx, l(2.510000, 2.510000, 2.510000, 0.000000), l(0.030000, 0.030000, 0.030000, 0.000000) +mul r1.xyz, r0.xyzx, r1.xyzx +mad r2.xyz, r0.xyzx, l(2.430000, 2.430000, 2.430000, 0.000000), l(0.590000, 0.590000, 0.590000, 0.000000) +mad r0.xyz, r0.xyzx, r2.xyzx, l(0.140000, 0.140000, 0.140000, 0.000000) +div_sat o0.xyz, r1.xyzx, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSACESFilmic[] = +{ + 68, 88, 66, 67, 64, 246, + 93, 24, 102, 253, 15, 247, + 109, 62, 229, 230, 5, 254, + 203, 169, 1, 0, 0, 0, + 80, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 144, 1, 0, 0, + 64, 0, 0, 0, 100, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 50, 0, + 0, 15, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 215, 163, + 32, 64, 215, 163, 32, 64, + 215, 163, 32, 64, 0, 0, + 0, 0, 2, 64, 0, 0, + 143, 194, 245, 60, 143, 194, + 245, 60, 143, 194, 245, 60, + 0, 0, 0, 0, 56, 0, + 0, 7, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 2, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 31, 133, 27, 64, + 31, 133, 27, 64, 31, 133, + 27, 64, 0, 0, 0, 0, + 2, 64, 0, 0, 61, 10, + 23, 63, 61, 10, 23, 63, + 61, 10, 23, 63, 0, 0, + 0, 0, 50, 0, 0, 12, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 2, 0, 0, 0, + 2, 64, 0, 0, 41, 92, + 15, 62, 41, 92, 15, 62, + 41, 92, 15, 62, 0, 0, + 0, 0, 14, 32, 0, 7, + 114, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb new file mode 100644 index 00000000..960aaf49 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc new file mode 100644 index 00000000..389a495b --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc @@ -0,0 +1,156 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +mad r1.xyz, r0.xyzx, l(2.510000, 2.510000, 2.510000, 0.000000), l(0.030000, 0.030000, 0.030000, 0.000000) +mul r1.xyz, r0.xyzx, r1.xyzx +mad r2.xyz, r0.xyzx, l(2.430000, 2.430000, 2.430000, 0.000000), l(0.590000, 0.590000, 0.590000, 0.000000) +mad r0.xyz, r0.xyzx, r2.xyzx, l(0.140000, 0.140000, 0.140000, 0.000000) +div_sat r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSACESFilmic_SRGB[] = +{ + 68, 88, 66, 67, 173, 239, + 88, 1, 231, 89, 20, 11, + 118, 182, 104, 134, 53, 174, + 14, 103, 1, 0, 0, 0, + 160, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 224, 1, 0, 0, + 64, 0, 0, 0, 120, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 50, 0, + 0, 15, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 215, 163, + 32, 64, 215, 163, 32, 64, + 215, 163, 32, 64, 0, 0, + 0, 0, 2, 64, 0, 0, + 143, 194, 245, 60, 143, 194, + 245, 60, 143, 194, 245, 60, + 0, 0, 0, 0, 56, 0, + 0, 7, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 2, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 31, 133, 27, 64, + 31, 133, 27, 64, 31, 133, + 27, 64, 0, 0, 0, 0, + 2, 64, 0, 0, 61, 10, + 23, 63, 61, 10, 23, 63, + 61, 10, 23, 63, 0, 0, + 0, 0, 50, 0, 0, 12, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 2, 0, 0, 0, + 2, 64, 0, 0, 41, 92, + 15, 62, 41, 92, 15, 62, + 41, 92, 15, 62, 0, 0, + 0, 0, 14, 32, 0, 7, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 47, 0, 0, 5, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 47, 186, 232, 62, + 47, 186, 232, 62, 47, 186, + 232, 62, 0, 0, 0, 0, + 25, 0, 0, 5, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb new file mode 100644 index 00000000..00faedaa Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.inc new file mode 100644 index 00000000..cc2b52f7 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.inc @@ -0,0 +1,81 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +sample o0.xyzw, v1.xyxx, t0.xyzw, s0 +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSCopy[] = +{ + 68, 88, 66, 67, 108, 129, + 30, 239, 130, 190, 108, 21, + 28, 176, 127, 137, 202, 107, + 77, 84, 1, 0, 0, 0, + 36, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 100, 0, 0, 0, + 64, 0, 0, 0, 25, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 69, 0, 0, 9, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.pdb new file mode 100644 index 00000000..060416d3 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSCopy.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.inc new file mode 100644 index 00000000..ff06990c --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.inc @@ -0,0 +1,189 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 r1.x, l(0.627404, 0.329282, 0.043314, 0.000000), r0.xyzx +dp3 r1.y, l(0.069097, 0.919540, 0.011361, 0.000000), r0.xyzx +dp3 r1.z, l(0.016392, 0.088013, 0.895595, 0.000000), r0.xyzx +mov o0.w, r0.w +mul r0.xyz, r1.xyzx, cb0[0].yyyy +mul r0.xyz, r0.xyzx, l(0.000100, 0.000100, 0.000100, 0.000000) +log r0.xyz, |r0.xyzx| +mul r0.xyz, r0.xyzx, l(0.159302, 0.159302, 0.159302, 0.000000) +exp r0.xyz, r0.xyzx +mad r1.xyz, r0.xyzx, l(18.851563, 18.851563, 18.851563, 0.000000), l(0.835938, 0.835938, 0.835938, 0.000000) +mad r0.xyz, r0.xyzx, l(18.687500, 18.687500, 18.687500, 0.000000), l(1.000000, 1.000000, 1.000000, 0.000000) +div r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(78.843750, 78.843750, 78.843750, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSHDR10[] = +{ + 68, 88, 66, 67, 134, 120, + 193, 176, 6, 217, 254, 46, + 47, 155, 215, 110, 125, 224, + 213, 122, 1, 0, 0, 0, + 72, 3, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 136, 2, 0, 0, + 64, 0, 0, 0, 162, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 16, 0, 0, 10, 18, 0, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 140, 157, + 32, 63, 166, 151, 168, 62, + 154, 105, 49, 61, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 34, 0, 16, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 186, 130, 141, 61, + 249, 102, 107, 63, 84, 36, + 58, 60, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 16, 0, 0, 10, + 66, 0, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 173, 71, 134, 60, 68, 64, + 180, 61, 183, 69, 101, 63, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 8, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 86, 133, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 56, 0, + 0, 10, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 23, 183, + 209, 56, 23, 183, 209, 56, + 23, 183, 209, 56, 0, 0, + 0, 0, 47, 0, 0, 6, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 128, + 129, 0, 0, 0, 0, 0, + 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 32, 35, 62, + 0, 32, 35, 62, 0, 32, + 35, 62, 0, 0, 0, 0, + 25, 0, 0, 5, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 208, 150, 65, + 0, 208, 150, 65, 0, 208, + 150, 65, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 86, 63, 0, 0, 86, 63, + 0, 0, 86, 63, 0, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 128, 149, 65, + 0, 128, 149, 65, 0, 128, + 149, 65, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 0, 0, 14, 0, 0, 7, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 47, 0, 0, 5, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 176, 157, 66, + 0, 176, 157, 66, 0, 176, + 157, 66, 0, 0, 0, 0, + 25, 0, 0, 5, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb new file mode 100644 index 00000000..409a9964 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.inc new file mode 100644 index 00000000..69fb6c32 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.inc @@ -0,0 +1,113 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r1.xyz, r0.xyzx, cb0[0].xxxx +mad r0.xyz, r0.xyzx, cb0[0].xxxx, l(1.000000, 1.000000, 1.000000, 0.000000) +mov o0.w, r0.w +div o0.xyz, r1.xyzx, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSReinhard[] = +{ + 68, 88, 66, 67, 115, 103, + 22, 225, 226, 48, 165, 189, + 78, 48, 254, 136, 10, 133, + 40, 112, 1, 0, 0, 0, + 192, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 0, 1, 0, 0, + 64, 0, 0, 0, 64, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 114, 0, + 16, 0, 1, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 0, 13, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 6, 128, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 14, 0, 0, 7, + 114, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb new file mode 100644 index 00000000..1594e39c Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc new file mode 100644 index 00000000..a57abdf1 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc @@ -0,0 +1,130 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r1.xyz, r0.xyzx, cb0[0].xxxx +mad r0.xyz, r0.xyzx, cb0[0].xxxx, l(1.000000, 1.000000, 1.000000, 0.000000) +mov o0.w, r0.w +div r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, |r0.xyzx| +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSReinhard_SRGB[] = +{ + 68, 88, 66, 67, 57, 227, + 234, 239, 176, 217, 183, 250, + 229, 25, 59, 13, 250, 49, + 198, 13, 1, 0, 0, 0, + 20, 2, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 84, 1, 0, 0, + 64, 0, 0, 0, 85, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 114, 0, + 16, 0, 1, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 0, 13, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 6, 128, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 14, 0, 0, 7, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 47, 0, 0, 6, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 128, 129, 0, + 0, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 47, 186, 232, 62, 47, 186, + 232, 62, 47, 186, 232, 62, + 0, 0, 0, 0, 25, 0, + 0, 5, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb new file mode 100644 index 00000000..ace6749b Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.inc new file mode 100644 index 00000000..052cc961 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.inc @@ -0,0 +1,98 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul_sat o0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSSaturate[] = +{ + 68, 88, 66, 67, 74, 164, + 55, 248, 55, 5, 223, 243, + 66, 186, 89, 42, 66, 172, + 83, 127, 1, 0, 0, 0, + 112, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 176, 0, 0, 0, + 64, 0, 0, 0, 44, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 32, 0, 8, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb new file mode 100644 index 00000000..e7f02d8e Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc new file mode 100644 index 00000000..fef9b26c --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc @@ -0,0 +1,114 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul_sat r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSSaturate_SRGB[] = +{ + 68, 88, 66, 67, 178, 67, + 199, 228, 117, 215, 182, 102, + 49, 24, 196, 144, 159, 179, + 114, 157, 1, 0, 0, 0, + 192, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 0, 1, 0, 0, + 64, 0, 0, 0, 64, 0, + 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 56, 32, 0, 8, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 47, 0, + 0, 5, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 47, 186, 232, 62, 47, 186, + 232, 62, 47, 186, 232, 62, + 0, 0, 0, 0, 25, 0, + 0, 5, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb new file mode 100644 index 00000000..59499a4f Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc new file mode 100644 index 00000000..9a5012cf --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc @@ -0,0 +1,105 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_4_0 +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v1.xyxx, t0.xyzw, s0 +log r0.xyz, |r0.xyzx| +mov o0.w, r0.w +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PS_SRGB[] = +{ + 68, 88, 66, 67, 162, 217, + 196, 65, 176, 181, 217, 116, + 30, 75, 91, 141, 251, 6, + 236, 10, 1, 0, 0, 0, + 148, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 132, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 80, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, + 83, 86, 95, 80, 111, 115, + 105, 116, 105, 111, 110, 0, + 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, + 116, 0, 171, 171, 83, 72, + 68, 82, 212, 0, 0, 0, + 64, 0, 0, 0, 53, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 9, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, + 16, 0, 0, 0, 0, 0, + 0, 96, 16, 0, 0, 0, + 0, 0, 47, 0, 0, 6, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 128, + 129, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 10, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 47, 186, + 232, 62, 47, 186, 232, 62, + 47, 186, 232, 62, 0, 0, + 0, 0, 25, 0, 0, 5, + 114, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb new file mode 100644 index 00000000..dd5c3a19 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.inc b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.inc new file mode 100644 index 00000000..9190593d --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.inc @@ -0,0 +1,119 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_4_0 +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_VSQuad[] = +{ + 68, 88, 66, 67, 141, 120, + 239, 206, 52, 223, 131, 56, + 184, 188, 219, 176, 80, 69, + 20, 97, 1, 0, 0, 0, + 224, 1, 0, 0, 3, 0, + 0, 0, 44, 0, 0, 0, + 96, 0, 0, 0, 184, 0, + 0, 0, 73, 83, 71, 78, + 44, 0, 0, 0, 1, 0, + 0, 0, 8, 0, 0, 0, + 32, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 0, 0, + 83, 86, 95, 86, 101, 114, + 116, 101, 120, 73, 100, 0, + 79, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 12, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 83, 72, + 68, 82, 32, 1, 0, 0, + 64, 0, 1, 0, 72, 0, + 0, 0, 96, 0, 0, 4, + 18, 16, 16, 0, 0, 0, + 0, 0, 6, 0, 0, 0, + 103, 0, 0, 4, 242, 32, + 16, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, + 1, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 54, 0, 0, 8, 194, 32, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 128, 63, 1, 0, 0, 7, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 85, 0, 0, 7, 66, 0, + 16, 0, 0, 0, 0, 0, + 10, 16, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 1, 0, 0, 0, 86, 0, + 0, 5, 50, 0, 16, 0, + 0, 0, 0, 0, 134, 0, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 10, 194, 0, + 16, 0, 0, 0, 0, 0, + 6, 4, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 191, + 0, 0, 0, 191, 54, 0, + 0, 5, 50, 32, 16, 0, + 1, 0, 0, 0, 70, 0, + 16, 0, 0, 0, 0, 0, + 0, 0, 0, 7, 18, 32, + 16, 0, 0, 0, 0, 0, + 42, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 7, 34, 32, 16, 0, + 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, + 0, 192, 62, 0, 0, 1 +}; diff --git a/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.pdb b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.pdb new file mode 100644 index 00000000..aa9b6425 Binary files /dev/null and b/Kits/DirectXTK/Src/Shaders/Compiled/ToneMap_VSQuad.pdb differ diff --git a/Kits/DirectXTK/Src/Shaders/PostProcess.fx b/Kits/DirectXTK/Src/Shaders/PostProcess.fx new file mode 100644 index 00000000..7eab7757 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/PostProcess.fx @@ -0,0 +1,181 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 + +static const int MAX_SAMPLES = 16; + + +Texture2D Texture : register(t0); +sampler Sampler : register(s0); + + +cbuffer Parameters : register(b0) +{ + float4 sampleOffsets[MAX_SAMPLES]; + float4 sampleWeights[MAX_SAMPLES]; +}; + + +#include "Structures.fxh" + + +// Vertex shader: self-created quad. +VSInputTx VSQuad(uint vI : SV_VertexId) +{ + VSInputTx vout; + + float2 texcoord = float2(vI & 1, vI >> 1); + vout.TexCoord = texcoord; + + vout.Position = float4((texcoord.x - 0.5f) * 2, -(texcoord.y - 0.5f) * 2, 0, 1); + return vout; +} + + +//-------------------------------------------------------------------------------------- +// Pixel shader: copy. +float4 PSCopy(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + return color; +} + + +// Pixel shader: monochrome. +float4 PSMonochrome(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + float3 grayscale = float3(0.2125f, 0.7154f, 0.0721f); + float3 output = dot(color.rgb, grayscale); + return float4(output, color.a); +} + + +// Pixel shader: sepia. +float4 PSSepia(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + + float3 red = float3(0.393f, 0.769f, 0.189f); + float3 green = float3(0.349f, 0.686f, 0.168f); + float3 blue = float3(0.272f, 0.534f, 0.131f); + + float3 output; + output.r = dot(color.rgb, red); + output.g = dot(color.rgb, green); + output.b = dot(color.rgb, blue); + return float4(output, color.a); +} + + +// Pixel shader: down-sample 2x2. +float4 PSDownScale2x2(VSInputTx pin) : SV_Target0 +{ + const int NUM_SAMPLES = 4; + float4 vColor = 0.0f; + + for( int i=0; i < NUM_SAMPLES; i++ ) + { + vColor += Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor / NUM_SAMPLES; +} + + +// Pixel shader: down-sample 4x4. +float4 PSDownScale4x4(VSInputTx pin) : SV_Target0 +{ + const int NUM_SAMPLES = 16; + float4 vColor = 0.0f; + + for (int i = 0; i < NUM_SAMPLES; i++) + { + vColor += Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor / NUM_SAMPLES; +} + + +// Pixel shader: gaussian blur 5x5. +float4 PSGaussianBlur5x5(VSInputTx pin) : SV_Target0 +{ + float4 vColor = 0.0f; + + for (int i = 0; i < 13; i++) + { + vColor += sampleWeights[i] * Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor; +} + + +// Pixel shader: bloom (extract) +float4 PSBloomExtract(VSInputTx pin) : SV_Target0 +{ + // Uses sampleWeights[0] as 'bloom threshold' + float4 c = Texture.Sample(Sampler, pin.TexCoord); + return saturate((c - sampleWeights[0]) / (1 - sampleWeights[0])); +} + + +// Pixel shader: bloom (blur) +float4 PSBloomBlur(VSInputTx pin) : SV_Target0 +{ + float4 vColor = 0.0f; + + // Perform a one-directional gaussian blur + for (int i = 0; i < 15; i++) + { + vColor += sampleWeights[i] * Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor; +} + + +//-------------------------------------------------------------------------------------- +Texture2D Texture2 : register(t1); + +// Pixel shader: merge +float4 PSMerge(VSInputTx pin) : SV_Target0 +{ + float4 vColor = sampleWeights[0] * Texture.Sample(Sampler, pin.TexCoord); + vColor += sampleWeights[1] * Texture2.Sample(Sampler, pin.TexCoord); + return vColor; +} + + +// Pixel shader: bloom (combine) +float4 AdjustSaturation(float4 color, float saturation) +{ + float3 grayscale = float3(0.2125f, 0.7154f, 0.0721f); + float gray = dot(color.rgb, grayscale); + return lerp(gray, color, saturation); +} + +float4 PSBloomCombine(VSInputTx pin) : SV_Target0 +{ + // Uses sampleWeights[0].x as base saturation, sampleWeights[0].y as bloom saturation + // Uses sampleWeights[1] as base intensity; sampleWeights[2] as bloom intensity + float4 base = Texture.Sample(Sampler, pin.TexCoord); + float4 bloom = Texture2.Sample(Sampler, pin.TexCoord); + + // Adjust color saturation and intensity. + base = AdjustSaturation(base, sampleWeights[0].x) * sampleWeights[1]; + bloom = AdjustSaturation(bloom, sampleWeights[0].y) * sampleWeights[2]; + + // Darken down the base image in areas where there is a lot of bloom, + // to prevent things looking excessively burned-out. + base *= (1 - saturate(bloom)); + + // Combine the two images. + return base + bloom; +} diff --git a/Kits/DirectXTK/Src/Shaders/ToneMap.fx b/Kits/DirectXTK/Src/Shaders/ToneMap.fx new file mode 100644 index 00000000..8b5f0973 --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/ToneMap.fx @@ -0,0 +1,231 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 + +Texture2D HDRTexture : register(t0); +sampler Sampler : register(s0); + + +cbuffer Parameters : register(b0) +{ + float linearExposure : packoffset(c0.x); + float paperWhiteNits : packoffset(c0.y); +}; + + + +#include "Structures.fxh" +#include "Utilities.fxh" + + +// Vertex shader: self-created quad. +VSInputTx VSQuad(uint vI : SV_VertexId) +{ + VSInputTx vout; + + float2 texcoord = float2(vI & 1, vI >> 1); + vout.TexCoord = texcoord; + + vout.Position = float4((texcoord.x - 0.5f) * 2, -(texcoord.y - 0.5f) * 2, 0, 1); + return vout; +} + + +//-------------------------------------------------------------------------------------- +// Pixel shader: pass-through +float4 PSCopy(VSInputTx pin) : SV_Target0 +{ + return HDRTexture.Sample(Sampler, pin.TexCoord); +} + + +// Pixel shader: saturate (clips above 1.0) +float4 PSSaturate(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = saturate(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +// Pixel shader: reinhard operator +float4 PSReinhard(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +// Pixel shader: ACES filmic operator +float4 PSACESFilmic(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +// SRGB, using Rec.709 color primaries and a gamma 2.2 curve + +// Pixel shader: sRGB +float4 PS_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 srgb = LinearToSRGBEst(hdr.xyz); + return float4(srgb, hdr.a); +} + + +// Pixel shader: saturate (clips above 1.0) +float4 PSSaturate_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = saturate(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +// Pixel shader: reinhard operator +float4 PSReinhard_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +// Pixel shader: ACES filmic operator +float4 PSACESFilmic_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +// HDR10, using Rec.2020 color primaries and ST.2084 curve + +float3 HDR10(float3 color) +{ + // Rotate from Rec.709 to Rec.2020 primaries + float3 rgb = mul(from709to2020, color); + + // ST.2084 spec defines max nits as 10,000 nits + float3 normalized = rgb * paperWhiteNits / 10000.f; + + // Apply ST.2084 curve + return LinearToST2084(normalized); +} + +float4 PSHDR10(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + return float4(rgb, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +struct MRTOut +{ + float4 hdr : SV_Target0; + float4 sdr : SV_Target1; +}; + +MRTOut PSHDR10_Saturate(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = saturate(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +MRTOut PSHDR10_Reinhard(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +MRTOut PSHDR10_ACESFilmic(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +MRTOut PSHDR10_Saturate_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = saturate(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} + +MRTOut PSHDR10_Reinhard_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} + +MRTOut PSHDR10_ACESFilmic_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} diff --git a/Kits/DirectXTK/Src/Shaders/Utilities.fxh b/Kits/DirectXTK/Src/Shaders/Utilities.fxh new file mode 100644 index 00000000..908d95db --- /dev/null +++ b/Kits/DirectXTK/Src/Shaders/Utilities.fxh @@ -0,0 +1,74 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 + + +// sRGB +// https://en.wikipedia.org/wiki/SRGB + +// Apply the (approximate) sRGB curve to linear values +float3 LinearToSRGBEst(float3 color) +{ + return pow(abs(color), 1/2.2f); +} + + +// (Approximate) sRGB to linear +float3 SRGBToLinearEst(float3 srgb) +{ + return pow(abs(srgb), 2.2f); +} + + +// HDR10 Media Profile +// https://en.wikipedia.org/wiki/High-dynamic-range_video#HDR10 + + +// Color rotation matrix to rotate Rec.709 color primaries into Rec.2020 +static const float3x3 from709to2020 = +{ + { 0.6274040f, 0.3292820f, 0.0433136f }, + { 0.0690970f, 0.9195400f, 0.0113612f }, + { 0.0163916f, 0.0880132f, 0.8955950f } +}; + + +// Apply the ST.2084 curve to normalized linear values and outputs normalized non-linear values +float3 LinearToST2084(float3 normalizedLinearValue) +{ + return pow((0.8359375f + 18.8515625f * pow(abs(normalizedLinearValue), 0.1593017578f)) / (1.0f + 18.6875f * pow(abs(normalizedLinearValue), 0.1593017578f)), 78.84375f); +} + + +// ST.2084 to linear, resulting in a linear normalized value +float3 ST2084ToLinear(float3 ST2084) +{ + return pow(max(pow(abs(ST2084), 1.0f / 78.84375f) - 0.8359375f, 0.0f) / (18.8515625f - 18.6875f * pow(abs(ST2084), 1.0f / 78.84375f)), 1.0f / 0.1593017578f); +} + + +// Reinhard tonemap operator +// Reinhard et al. "Photographic tone reproduction for digital images." ACM Transactions on Graphics. 21. 2002. +// http://www.cs.utah.edu/~reinhard/cdrom/tonemap.pdf +float3 ToneMapReinhard(float3 color) +{ + return color / (1.0f + color); +} + + +// ACES Filmic tonemap operator +// https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/ +float3 ToneMapACESFilmic(float3 x) +{ + float a = 2.51f; + float b = 0.03f; + float c = 2.43f; + float d = 0.59f; + float e = 0.14f; + return saturate((x*(a*x+b))/(x*(c*x+d)+e)); +} diff --git a/Kits/DirectXTK/Src/SpriteBatch.cpp b/Kits/DirectXTK/Src/SpriteBatch.cpp index 54f34482..6d747fbc 100644 --- a/Kits/DirectXTK/Src/SpriteBatch.cpp +++ b/Kits/DirectXTK/Src/SpriteBatch.cpp @@ -72,7 +72,7 @@ __declspec(align(16)) class SpriteBatch::Impl : public AlignedNew setCustomShaders, + std::function& setCustomShaders, FXMMATRIX transformMatrix); void End(); @@ -392,7 +392,7 @@ void XM_CALLCONV SpriteBatch::Impl::Begin(SpriteSortMode sortMode, ID3D11SamplerState* samplerState, ID3D11DepthStencilState* depthStencilState, ID3D11RasterizerState* rasterizerState, - std::function setCustomShaders, + std::function& setCustomShaders, FXMMATRIX transformMatrix) { if (mInBeginEndPair) diff --git a/Kits/DirectXTK/Src/ToneMapPostProcess.cpp b/Kits/DirectXTK/Src/ToneMapPostProcess.cpp new file mode 100644 index 00000000..875fb39c --- /dev/null +++ b/Kits/DirectXTK/Src/ToneMapPostProcess.cpp @@ -0,0 +1,430 @@ +//-------------------------------------------------------------------------------------- +// File: ToneMapPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "ConstantBuffer.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + +#if defined(_XBOX_ONE) && defined(_TITLE) + const int PixelShaderCount = 15; + const int ShaderPermutationCount = 24; +#else + const int PixelShaderCount = 9; + const int ShaderPermutationCount = 12; +#endif + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct ToneMapConstants + { + // linearExposure is .x + // paperWhiteNits is .y + XMVECTOR parameters; + }; + + static_assert((sizeof(ToneMapConstants) % 16) == 0, "CB size not padded correctly"); +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOneToneMap_VSQuad.inc" + + #include "Shaders/Compiled/XboxOneToneMap_PSCopy.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSSaturate.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSReinhard.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSACESFilmic.inc" + #include "Shaders/Compiled/XboxOneToneMap_PS_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSSaturate_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSReinhard_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSACESFilmic_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Saturate.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Reinhard.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_ACESFilmic.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Saturate_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Reinhard_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_ACESFilmic_SRGB.inc" +#else + #include "Shaders/Compiled/ToneMap_VSQuad.inc" + + #include "Shaders/Compiled/ToneMap_PSCopy.inc" + #include "Shaders/Compiled/ToneMap_PSSaturate.inc" + #include "Shaders/Compiled/ToneMap_PSReinhard.inc" + #include "Shaders/Compiled/ToneMap_PSACESFilmic.inc" + #include "Shaders/Compiled/ToneMap_PS_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSHDR10.inc" +#endif +} + +namespace +{ + struct ShaderBytecode + { + void const* code; + size_t length; + }; + + const ShaderBytecode pixelShaders[] = + { + { ToneMap_PSCopy, sizeof(ToneMap_PSCopy) }, + { ToneMap_PSSaturate, sizeof(ToneMap_PSSaturate) }, + { ToneMap_PSReinhard, sizeof(ToneMap_PSReinhard) }, + { ToneMap_PSACESFilmic, sizeof(ToneMap_PSACESFilmic) }, + { ToneMap_PS_SRGB, sizeof(ToneMap_PS_SRGB) }, + { ToneMap_PSSaturate_SRGB, sizeof(ToneMap_PSSaturate_SRGB) }, + { ToneMap_PSReinhard_SRGB, sizeof(ToneMap_PSReinhard_SRGB) }, + { ToneMap_PSACESFilmic_SRGB, sizeof(ToneMap_PSACESFilmic_SRGB) }, + { ToneMap_PSHDR10, sizeof(ToneMap_PSHDR10) }, + +#if defined(_XBOX_ONE) && defined(_TITLE) + // Shaders that generate both HDR10 and GameDVR SDR signals via Multiple Render Targets. + { ToneMap_PSHDR10_Saturate, sizeof(ToneMap_PSHDR10_Saturate) }, + { ToneMap_PSHDR10_Reinhard, sizeof(ToneMap_PSHDR10_Reinhard) }, + { ToneMap_PSHDR10_ACESFilmic, sizeof(ToneMap_PSHDR10_ACESFilmic) }, + { ToneMap_PSHDR10_Saturate_SRGB, sizeof(ToneMap_PSHDR10_Saturate_SRGB) }, + { ToneMap_PSHDR10_Reinhard_SRGB, sizeof(ToneMap_PSHDR10_Reinhard_SRGB) }, + { ToneMap_PSHDR10_ACESFilmic_SRGB, sizeof(ToneMap_PSHDR10_ACESFilmic_SRGB) }, +#endif + }; + + static_assert(_countof(pixelShaders) == PixelShaderCount, "array/max mismatch"); + + const int pixelShaderIndices[] = + { + // Linear EOTF + 0, // Copy + 1, // Saturate + 2, // Reinhard + 3, // ACES Filmic + + // Gamam22 EOTF + 4, // SRGB + 5, // Saturate_SRGB + 6, // Reinhard_SRGB + 7, // ACES Filmic + + // ST.2084 EOTF + 8, // HDR10 + 8, // HDR10 + 8, // HDR10 + 8, // HDR10 + +#if defined(_XBOX_ONE) && defined(_TITLE) + // MRT Linear EOTF + 9, // HDR10+Saturate + 9, // HDR10+Saturate + 10, // HDR10+Reinhard + 11, // HDR10+ACESFilmic + + // MRT Gamma22 EOTF + 12, // HDR10+Saturate_SRGB + 12, // HDR10+Saturate_SRGB + 13, // HDR10+Reinhard_SRGB + 14, // HDR10+ACESFilmic + + // MRT ST.2084 EOTF + 9, // HDR10+Saturate + 9, // HDR10+Saturate + 10, // HDR10+Reinhard + 11, // HDR10+ACESFilmic +#endif + }; + + static_assert(_countof(pixelShaderIndices) == ShaderPermutationCount, "array/max mismatch"); + + // Factory for lazily instantiating shaders. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D11Device* device) + : mDevice(device), + stateObjects(device) + { } + + // Gets or lazily creates the vertex shader. + ID3D11VertexShader* GetVertexShader() + { + return DemandCreate(mVertexShader, mMutex, [&](ID3D11VertexShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreateVertexShader(ToneMap_VSQuad, sizeof(ToneMap_VSQuad), nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "ToneMapPostProcess"); + + return hr; + }); + } + + // Gets or lazily creates the specified pixel shader. + ID3D11PixelShader* GetPixelShader(int permutation) + { + assert(permutation >= 0 && permutation < ShaderPermutationCount); + _Analysis_assume_(permutation >= 0 && permutation < ShaderPermutationCount); + int shaderIndex = pixelShaderIndices[permutation]; + assert(shaderIndex >= 0 && shaderIndex < PixelShaderCount); + _Analysis_assume_(shaderIndex >= 0 && shaderIndex < PixelShaderCount); + + return DemandCreate(mPixelShaders[shaderIndex], mMutex, [&](ID3D11PixelShader** pResult) -> HRESULT + { + HRESULT hr = mDevice->CreatePixelShader(pixelShaders[shaderIndex].code, pixelShaders[shaderIndex].length, nullptr, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, "ToneMapPostProcess"); + + return hr; + }); + } + + CommonStates stateObjects; + + protected: + ComPtr mDevice; + ComPtr mVertexShader; + ComPtr mPixelShaders[PixelShaderCount]; + std::mutex mMutex; + }; +} + +class ToneMapPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D11Device* device); + + void Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState); + + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + int GetCurrentShaderPermutation() const; + + // Fields. + ToneMapConstants constants; + ComPtr hdrTexture; + float linearExposure; + float paperWhiteNits; + + Operator op; + TransferFunction func; + bool mrt; + +private: + int mDirtyFlags; + + ConstantBuffer mConstantBuffer; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device ToneMapPostProcess resources. +SharedResourcePool ToneMapPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +ToneMapPostProcess::Impl::Impl(_In_ ID3D11Device* device) + : mConstantBuffer(device), + mDeviceResources(deviceResourcesPool.DemandCreate(device)), + linearExposure(1.f), + paperWhiteNits(200.f), + op(None), + func(Linear), + mrt(false), + mDirtyFlags(INT_MAX), + constants{} +{ + if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0) + { + throw std::exception("ToneMapPostProcess requires Feature Level 10.0 or later"); + } +} + + +// Sets our state onto the D3D device. +void ToneMapPostProcess::Impl::Process(_In_ ID3D11DeviceContext* deviceContext, std::function& setCustomState) +{ + // Set the texture. + ID3D11ShaderResourceView* textures[1] = { hdrTexture.Get() }; + deviceContext->PSSetShaderResources(0, 1, textures); + + auto sampler = mDeviceResources->stateObjects.PointClamp(); + deviceContext->PSSetSamplers(0, 1, &sampler); + + // Set state objects. + deviceContext->OMSetBlendState(mDeviceResources->stateObjects.Opaque(), nullptr, 0xffffffff); + deviceContext->OMSetDepthStencilState(mDeviceResources->stateObjects.DepthNone(), 0); + deviceContext->RSSetState(mDeviceResources->stateObjects.CullNone()); + + // Set shaders. + auto vertexShader = mDeviceResources->GetVertexShader(); + auto pixelShader = mDeviceResources->GetPixelShader(GetCurrentShaderPermutation()); + + deviceContext->VSSetShader(vertexShader, nullptr, 0); + deviceContext->PSSetShader(pixelShader, nullptr, 0); + + // Set constants. + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + constants.parameters = XMVectorSet(linearExposure, paperWhiteNits, 0.f, 0.f); + } + +#if defined(_XBOX_ONE) && defined(_TITLE) + void *grfxMemory; + mConstantBuffer.SetData(deviceContext, constants, &grfxMemory); + + Microsoft::WRL::ComPtr deviceContextX; + ThrowIfFailed(deviceContext->QueryInterface(IID_GRAPHICS_PPV_ARGS(deviceContextX.GetAddressOf()))); + + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContextX->PSSetPlacementConstantBuffer(0, buffer, grfxMemory); +#else + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer.SetData(deviceContext, constants); + } + + // Set the constant buffer. + auto buffer = mConstantBuffer.GetBuffer(); + + deviceContext->PSSetConstantBuffers(0, 1, &buffer); +#endif + + if (setCustomState) + { + setCustomState(); + } + + // Draw quad. + deviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + + deviceContext->Draw(4, 0); +} + + +int ToneMapPostProcess::Impl::GetCurrentShaderPermutation() const +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + int permutation = (mrt) ? 12 : 0; + return permutation + (static_cast(func) * static_cast(Operator_Max)) + static_cast(op); +#else + return (static_cast(func) * static_cast(Operator_Max)) + static_cast(op); +#endif +} + + +// Public constructor. +ToneMapPostProcess::ToneMapPostProcess(_In_ ID3D11Device* device) + : pImpl(new Impl(device)) +{ +} + + +// Move constructor. +ToneMapPostProcess::ToneMapPostProcess(ToneMapPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +ToneMapPostProcess& ToneMapPostProcess::operator= (ToneMapPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +ToneMapPostProcess::~ToneMapPostProcess() +{ +} + + +// IPostProcess methods. +void ToneMapPostProcess::Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function setCustomState) +{ + pImpl->Process(deviceContext, setCustomState); +} + + +// Shader control. +void ToneMapPostProcess::SetOperator(Operator op) +{ + if (op < 0 || op >= Operator_Max) + throw std::out_of_range("Tonemap operator not defined"); + + pImpl->op = op; +} + + +void ToneMapPostProcess::SetTransferFunction(TransferFunction func) +{ + if (func < 0 || func >= TransferFunction_Max) + throw std::out_of_range("Electro-optical transfer function not defined"); + + pImpl->func = func; +} + + +#if defined(_XBOX_ONE) && defined(_TITLE) +void ToneMapPostProcess::SetMRTOutput(bool value) +{ + pImpl->mrt = value; +} +#endif + + +// Properties +void ToneMapPostProcess::SetHDRSourceTexture(_In_opt_ ID3D11ShaderResourceView* value) +{ + pImpl->hdrTexture = value; +} + + +void ToneMapPostProcess::SetExposure(float exposureValue) +{ + pImpl->linearExposure = powf(2.f, exposureValue); + pImpl->SetDirtyFlag(); +} + + +void ToneMapPostProcess::SetST2084Parameter(float paperWhiteNits) +{ + pImpl->paperWhiteNits = paperWhiteNits; + pImpl->SetDirtyFlag(); +} diff --git a/Kits/DirectXTK/Src/WICTextureLoader.cpp b/Kits/DirectXTK/Src/WICTextureLoader.cpp index 2aa9f171..666b4e43 100644 --- a/Kits/DirectXTK/Src/WICTextureLoader.cpp +++ b/Kits/DirectXTK/Src/WICTextureLoader.cpp @@ -536,7 +536,7 @@ namespace return E_UNEXPECTED; } - hr = FC->Initialize(scaler.Get(), convertGUID, WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom); + hr = FC->Initialize(scaler.Get(), convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut); if (FAILED(hr)) return hr; @@ -564,7 +564,7 @@ namespace return E_UNEXPECTED; } - hr = FC->Initialize(frame, convertGUID, WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom); + hr = FC->Initialize(frame, convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut); if (FAILED(hr)) return hr; diff --git a/Kits/DirectXTK12/Audio/DynamicSoundEffectInstance.cpp b/Kits/DirectXTK12/Audio/DynamicSoundEffectInstance.cpp index 57be0ffe..9661f743 100644 --- a/Kits/DirectXTK12/Audio/DynamicSoundEffectInstance.cpp +++ b/Kits/DirectXTK12/Audio/DynamicSoundEffectInstance.cpp @@ -26,7 +26,7 @@ class DynamicSoundEffectInstance::Impl : public IVoiceNotify { public: Impl( _In_ AudioEngine* engine, - _In_ DynamicSoundEffectInstance* object, _In_opt_ std::function bufferNeeded, + _In_ DynamicSoundEffectInstance* object, std::function& bufferNeeded, int sampleRate, int channels, int sampleBits, SOUND_EFFECT_INSTANCE_FLAGS flags ) : mBase(), mBufferNeeded( nullptr ), diff --git a/Kits/DirectXTK12/Audio/SoundCommon.cpp b/Kits/DirectXTK12/Audio/SoundCommon.cpp index fa440487..df6f1e7f 100644 --- a/Kits/DirectXTK12/Audio/SoundCommon.cpp +++ b/Kits/DirectXTK12/Audio/SoundCommon.cpp @@ -727,7 +727,7 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi dwCalcFlags |= X3DAUDIO_CALCULATE_LPF_REVERB | X3DAUDIO_CALCULATE_REVERB; } - float matrix[ XAUDIO2_MAX_AUDIO_CHANNELS * 8 ]; + float matrix[XAUDIO2_MAX_AUDIO_CHANNELS * 8] = {}; assert( mDSPSettings.SrcChannelCount <= XAUDIO2_MAX_AUDIO_CHANNELS ); assert( mDSPSettings.DstChannelCount <= 8 ); mDSPSettings.pMatrixCoefficients = matrix; @@ -766,7 +766,11 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi if ( reverb ) { - (void)voice->SetOutputMatrix( reverb, 1, 1, &mDSPSettings.ReverbLevel ); + for ( size_t j = 0; j < mDSPSettings.SrcChannelCount; ++j ) + { + matrix[j] = mDSPSettings.ReverbLevel; + } + (void)voice->SetOutputMatrix( reverb, mDSPSettings.SrcChannelCount, 1, matrix ); } if ( mFlags & SoundEffectInstance_ReverbUseFilters ) diff --git a/Kits/DirectXTK12/Audio/WaveBankReader.h b/Kits/DirectXTK12/Audio/WaveBankReader.h index 239fa0fc..f8e79041 100644 --- a/Kits/DirectXTK12/Audio/WaveBankReader.h +++ b/Kits/DirectXTK12/Audio/WaveBankReader.h @@ -28,6 +28,9 @@ namespace DirectX public: WaveBankReader(); + WaveBankReader(WaveBankReader&&) = default; + WaveBankReader& operator= (WaveBankReader&&) = default; + WaveBankReader(WaveBankReader const&) = delete; WaveBankReader& operator= (WaveBankReader const&) = delete; diff --git a/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj b/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj index effd58a0..7ee8ab12 100644 --- a/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj +++ b/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj @@ -43,6 +43,7 @@ + @@ -221,6 +222,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -259,10 +286,31 @@ + + + + + + + + + + + + + + + + + + + + + @@ -276,11 +324,13 @@ + + @@ -313,6 +363,7 @@ + @@ -349,6 +400,16 @@ Document + + + Document + + + + + Document + + {945B8F0E-AE5F-447C-933A-9D069532D3E4} StaticLibrary diff --git a/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj.filters b/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj.filters index bd31101f..20dd8b9e 100644 --- a/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj.filters +++ b/Kits/DirectXTK12/DirectXTK_Windows10.vcxproj.filters @@ -150,6 +150,9 @@ Inc + + Inc + @@ -761,6 +764,153 @@ Src\Shaders\Symbols + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders + + + Src\Shaders\Shared + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Compiled + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders\Symbols + + + Src\Shaders + @@ -889,6 +1039,15 @@ Src + + Src + + + Src + + + Src + diff --git a/Kits/DirectXTK12/Inc/DescriptorHeap.h b/Kits/DirectXTK12/Inc/DescriptorHeap.h index aaea91b0..e3245817 100644 --- a/Kits/DirectXTK12/Inc/DescriptorHeap.h +++ b/Kits/DirectXTK12/Inc/DescriptorHeap.h @@ -15,8 +15,10 @@ #if defined(_XBOX_ONE) && defined(_TITLE) #include +#include #else #include +#include "d3dx12.h" #endif #include @@ -39,9 +41,9 @@ namespace DirectX _In_ const D3D12_DESCRIPTOR_HEAP_DESC* pDesc); DescriptorHeap( _In_ ID3D12Device* device, - _In_ D3D12_DESCRIPTOR_HEAP_TYPE type, - _In_ D3D12_DESCRIPTOR_HEAP_FLAGS flags, - _In_ size_t count); + D3D12_DESCRIPTOR_HEAP_TYPE type, + D3D12_DESCRIPTOR_HEAP_FLAGS flags, + size_t count); DescriptorHeap(DescriptorHeap&&) = default; DescriptorHeap& operator=(DescriptorHeap&&) = default; @@ -51,24 +53,24 @@ namespace DirectX D3D12_GPU_DESCRIPTOR_HANDLE __cdecl WriteDescriptors( _In_ ID3D12Device* device, - _In_ uint32_t offsetIntoHeap, - _In_ uint32_t totalDescriptorCount, + uint32_t offsetIntoHeap, + uint32_t totalDescriptorCount, _In_reads_(descriptorRangeCount) const D3D12_CPU_DESCRIPTOR_HANDLE* pDescriptorRangeStarts, _In_reads_(descriptorRangeCount) const uint32_t* pDescriptorRangeSizes, - _In_ uint32_t descriptorRangeCount); + uint32_t descriptorRangeCount); D3D12_GPU_DESCRIPTOR_HANDLE __cdecl WriteDescriptors( _In_ ID3D12Device* device, - _In_ uint32_t offsetIntoHeap, + uint32_t offsetIntoHeap, _In_reads_(descriptorRangeCount) const D3D12_CPU_DESCRIPTOR_HANDLE* pDescriptorRangeStarts, _In_reads_(descriptorRangeCount) const uint32_t* pDescriptorRangeSizes, - _In_ uint32_t descriptorRangeCount); + uint32_t descriptorRangeCount); D3D12_GPU_DESCRIPTOR_HANDLE __cdecl WriteDescriptors( _In_ ID3D12Device* device, - _In_ uint32_t offsetIntoHeap, + uint32_t offsetIntoHeap, _In_reads_(descriptorCount) const D3D12_CPU_DESCRIPTOR_HANDLE* pDescriptors, - _In_ uint32_t descriptorCount); + uint32_t descriptorCount); D3D12_GPU_DESCRIPTOR_HANDLE GetFirstGpuHandle() const { @@ -88,7 +90,7 @@ namespace DirectX assert(m_pHeap != 0); if (index >= m_desc.NumDescriptors) { - throw std::out_of_range("CD3DX12_CPU_DESCRIPTOR_HANDLE"); + throw std::out_of_range("D3DX12_GPU_DESCRIPTOR_HANDLE"); } assert(m_desc.Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE); return CD3DX12_GPU_DESCRIPTOR_HANDLE(m_hGPU, static_cast(index), m_increment); @@ -99,7 +101,7 @@ namespace DirectX assert(m_pHeap != 0); if (index >= m_desc.NumDescriptors) { - throw std::out_of_range("CD3DX12_CPU_DESCRIPTOR_HANDLE"); + throw std::out_of_range("D3DX12_CPU_DESCRIPTOR_HANDLE"); } return CD3DX12_CPU_DESCRIPTOR_HANDLE(m_hCPU, static_cast(index), m_increment); } @@ -123,4 +125,93 @@ namespace DirectX CD3DX12_GPU_DESCRIPTOR_HANDLE m_hGPU; uint32_t m_increment; }; + + + // Helper class for dynamically allocating descriptor indices. + // The pile is statically sized and will throw an exception if it becomes full. + class DescriptorPile : public DescriptorHeap + { + public: + using IndexType = size_t; + static const IndexType INVALID_INDEX = size_t(-1); + + DescriptorPile( + _In_ ID3D12DescriptorHeap* pExistingHeap, + size_t reserve = 0) + : DescriptorHeap(pExistingHeap), + m_top(reserve) + { + if (reserve > 0 && m_top >= Count()) + { + throw std::out_of_range("Reserve descriptor range is too large"); + } + } + + DescriptorPile( + _In_ ID3D12Device* device, + _In_ const D3D12_DESCRIPTOR_HEAP_DESC* pDesc, + size_t reserve = 0) + : DescriptorHeap(device, pDesc), + m_top(reserve) + { + if (reserve > 0 && m_top >= Count()) + { + throw std::out_of_range("Reserve descriptor range is too large"); + } + } + + DescriptorPile( + _In_ ID3D12Device* device, + D3D12_DESCRIPTOR_HEAP_TYPE type, + D3D12_DESCRIPTOR_HEAP_FLAGS flags, + size_t capacity, + size_t reserve = 0) + : DescriptorHeap(device, type, flags, capacity), + m_top(reserve) + { + if (reserve > 0 && m_top >= Count()) + { + throw std::out_of_range("Reserve descriptor range is too large"); + } + } + + DescriptorPile(const DescriptorPile&) = delete; + DescriptorPile& operator=(const DescriptorPile&) = delete; + + DescriptorPile(DescriptorPile&&) = default; + DescriptorPile& operator=(DescriptorPile&&) = default; + + IndexType Allocate() + { + IndexType start, end; + AllocateRange(1, start, end); + + return start; + } + + void AllocateRange(size_t numDescriptors, _Out_ IndexType& start, _Out_ IndexType& end) + { + // make sure we didn't allocate zero + if (numDescriptors == 0) + { + throw std::out_of_range("Can't allocate zero descriptors"); + } + + // get the current top + start = m_top; + + // increment top with new request + m_top += numDescriptors; + end = m_top; + + // make sure we have enough room + if (m_top >= Count()) + { + throw std::exception("Can't allocate more descriptors"); + } + } + + private: + IndexType m_top; + }; } diff --git a/Kits/DirectXTK12/Inc/PostProcess.h b/Kits/DirectXTK12/Inc/PostProcess.h new file mode 100644 index 00000000..f83a6201 --- /dev/null +++ b/Kits/DirectXTK12/Inc/PostProcess.h @@ -0,0 +1,189 @@ +//-------------------------------------------------------------------------------------- +// File: PostProcess.h +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 +//-------------------------------------------------------------------------------------- + +#pragma once + +#if defined(_XBOX_ONE) && defined(_TITLE) +#include +#else +#include +#endif + +#include +#include +#include + +#include "RenderTargetState.h" + + +namespace DirectX +{ + //---------------------------------------------------------------------------------- + // Abstract interface representing a post-process pass + class IPostProcess + { + public: + virtual ~IPostProcess() { } + + virtual void __cdecl Process(_In_ ID3D12GraphicsCommandList* commandList) = 0; + }; + + + //---------------------------------------------------------------------------------- + // Basic post-process + class BasicPostProcess : public IPostProcess + { + public: + enum Effect + { + Copy, + Monochrome, + Sepia, + DownScale_2x2, + DownScale_4x4, + GaussianBlur_5x5, + BloomExtract, + BloomBlur, + Effect_Max + }; + + explicit BasicPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect fx); + BasicPostProcess(BasicPostProcess&& moveFrom); + BasicPostProcess& operator= (BasicPostProcess&& moveFrom); + + BasicPostProcess(BasicPostProcess const&) = delete; + BasicPostProcess& operator= (BasicPostProcess const&) = delete; + + virtual ~BasicPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D12GraphicsCommandList* commandList) override; + + // Properties + void __cdecl SetSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor, _In_opt_ ID3D12Resource* resource); + + // Sets multiplier for GaussianBlur_5x5 + void __cdecl SetGaussianParameter(float multiplier); + + // Sets parameters for BloomExtract + void __cdecl SetBloomExtractParameter(float threshold); + + // Sets parameters for BloomBlur + void __cdecl SetBloomBlurParameters(bool horizontal, float size, float brightness); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; + + + //---------------------------------------------------------------------------------- + // Dual-texure post-process + class DualPostProcess : public IPostProcess + { + public: + enum Effect + { + Merge, + BloomCombine, + Effect_Max + }; + + explicit DualPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect fx); + DualPostProcess(DualPostProcess&& moveFrom); + DualPostProcess& operator= (DualPostProcess&& moveFrom); + + DualPostProcess(DualPostProcess const&) = delete; + DualPostProcess& operator= (DualPostProcess const&) = delete; + + virtual ~DualPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D12GraphicsCommandList* commandList) override; + + // Properties + void __cdecl SetSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor); + void __cdecl SetSourceTexture2(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor); + + // Sets parameters for Merge + void __cdecl SetMergeParameters(float weight1, float weight2); + + // Sets parameters for BloomCombine + void __cdecl SetBloomCombineParameters(float bloom, float base, float bloomSaturation, float baseSaturation); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; + + + //---------------------------------------------------------------------------------- + // Tone-map post-process + class ToneMapPostProcess : public IPostProcess + { + public: + enum Operator // Tone-mapping operator + { + None, // Pass-through + Saturate, // Clamp [0,1] + Reinhard, // x/(1+x) + ACESFilmic, + Operator_Max + }; + + enum TransferFunction // Electro-Optical Transfer Function (EOTF) + { + Linear, // Pass-through + SRGB, // sRGB (Rec.709 and approximate sRGB display curve) + ST2084, // HDR10 (Rec.2020 color primaries and ST.2084 display curve) + TransferFunction_Max + }; + + explicit ToneMapPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, + Operator op, TransferFunction func + #if defined(_XBOX_ONE) && defined(_TITLE) + , bool mrt = false + #endif + ); + + ToneMapPostProcess(ToneMapPostProcess&& moveFrom); + ToneMapPostProcess& operator= (ToneMapPostProcess&& moveFrom); + + ToneMapPostProcess(ToneMapPostProcess const&) = delete; + ToneMapPostProcess& operator= (ToneMapPostProcess const&) = delete; + + virtual ~ToneMapPostProcess(); + + // IPostProcess methods. + void __cdecl Process(_In_ ID3D12GraphicsCommandList* commandList) override; + + // Properties + void __cdecl SetHDRSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor); + + // Sets exposure value for LDR tonemap operators + void SetExposure(float exposureValue); + + // Sets ST.2084 parameter for how bright white should be in nits + void SetST2084Parameter(float paperWhiteNits); + + private: + // Private implementation. + class Impl; + + std::unique_ptr pImpl; + }; +} diff --git a/Kits/DirectXTK12/Readme.txt b/Kits/DirectXTK12/Readme.txt index eb653925..d60a9782 100644 --- a/Kits/DirectXTK12/Readme.txt +++ b/Kits/DirectXTK12/Readme.txt @@ -4,15 +4,16 @@ DirectXTK - the DirectX Tool Kit for DirectX 12 Copyright (c) Microsoft Corporation. All rights reserved. -April 24, 2017 +June 21, 2017 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop applications for Windows 10, and Xbox One exclusive apps. -This code is designed to build with Visual Studio 2015. It is recommended that you -make use of VS 2015 Update 3, Windows Tools 1.4.1, and the -Windows 10 Anniversary Update SDK (14393). +This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017. +It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the +Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10 +Creators Update SDK (15063). Inc\ Public Header Files (in the DirectX C++ namespace): @@ -22,14 +23,15 @@ Inc\ DDSTextureLoader.h - light-weight DDS file texture loader DescriptorHeap.h - helper for managing DX12 descriptor heaps DirectXHelpers.h - misc C++ helpers for D3D programming - Effects.h - set of built-in shaders for common rendering tasks EffectPipelineStateDescription.h - helper for creating PSOs + Effects.h - set of built-in shaders for common rendering tasks GamePad.h - gamepad controller helper using XInput GeometricPrimitive.h - draws basic shapes such as cubes and spheres GraphicsMemory.h - helper for managing dynamic graphics memory allocation Keyboard.h - keyboard state tracking helper Model.h - draws meshes loaded from .SDKMESH or .VBO files Mouse.h - mouse helper + PostProcess.h - set of built-in shaders for common post-processing operations PrimitiveBatch.h - simple and efficient way to draw user primitives RenderTargetState.h - helper for communicating render target requirements when creating PSOs ResourceUploadBatch.h - helper for managing texture resource upload to the GPU @@ -78,7 +80,8 @@ COMPARISONS TO DIRECTX 11 VERSION * No support for loading .CMO models or DGSL effect shaders (i.e. DGSLEffect) * VertexTypes does not include VertexPositionNormalTangentColorTexture or - VertexPositionNormalTangentColorTextureSkinning + VertexPositionNormalTangentColorTextureSkinning which were intended for use with + the DGSL pipeline. * DirectX Tool Kit for DirectX 11 supports Feature Level 9.x, while DirectX 12 requires Direct3D Feature Level 11.0. There are no expected DirectX 12 drivers for @@ -95,6 +98,14 @@ COMPARISONS TO DIRECTX 11 VERSION RELEASE HISTORY --------------- +June 21, 2017 + Post-processing support + Added DescriptorPile utility + SDKMESH loader fix when loading legacy files with all zero materials + DirectXTK for Audio: Minor fixes for environmental audio + Optimized root signatures for Effects shaders + Minor code cleanup + April 24, 2017 Regenerated shaders using Windows 10 Creators Update SDK (15063) Fixed NormalMapEffect shader selection for specular texture usage diff --git a/Kits/DirectXTK12/Src/AlphaTestEffect.cpp b/Kits/DirectXTK12/Src/AlphaTestEffect.cpp index 1f6c7ae3..6fc646cf 100644 --- a/Kits/DirectXTK12/Src/AlphaTestEffect.cpp +++ b/Kits/DirectXTK12/Src/AlphaTestEffect.cpp @@ -160,10 +160,10 @@ AlphaTestEffect::Impl::Impl(_In_ ID3D12Device* device, static_assert( _countof(EffectBase::PixelShaderBytecode) == AlphaTestEffectTraits::PixelShaderCount, "array/max mismatch" ); static_assert( _countof(EffectBase::PixelShaderIndices) == AlphaTestEffectTraits::ShaderPermutationCount, "array/max mismatch" ); - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; @@ -172,8 +172,8 @@ AlphaTestEffect::Impl::Impl(_In_ ID3D12Device* device, CD3DX12_DESCRIPTOR_RANGE textureSamplerRange(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureRange); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerRange); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureRange, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerRange, D3D12_SHADER_VISIBILITY_PIXEL); rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; @@ -197,7 +197,7 @@ AlphaTestEffect::Impl::Impl(_In_ ID3D12Device* device, throw std::invalid_argument("AlphaTestEffect"); } - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( (effectFlags & EffectFlags::VertexColor) != 0); assert(sp >= 0 && sp < AlphaTestEffectTraits::ShaderPermutationCount); @@ -212,7 +212,7 @@ AlphaTestEffect::Impl::Impl(_In_ ID3D12Device* device, mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"AlphaTestEffect"); } diff --git a/Kits/DirectXTK12/Src/BasicEffect.cpp b/Kits/DirectXTK12/Src/BasicEffect.cpp index c72fccc5..a7944e29 100644 --- a/Kits/DirectXTK12/Src/BasicEffect.cpp +++ b/Kits/DirectXTK12/Src/BasicEffect.cpp @@ -342,10 +342,10 @@ BasicEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effect textureEnabled = (effectFlags & EffectFlags::Texture) != 0; biasedVertexNormals = (effectFlags & EffectFlags::BiasedVertexNormals) != 0; - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; @@ -354,7 +354,7 @@ BasicEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effect CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); - // Root paramteer descriptor - conditionally initialized + // Root parameter descriptor - conditionally initialized CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; if (textureEnabled) @@ -363,8 +363,8 @@ BasicEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effect CD3DX12_DESCRIPTOR_RANGE textureSRV(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); CD3DX12_DESCRIPTOR_RANGE textureSampler(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler, D3D12_SHADER_VISIBILITY_PIXEL); // use all parameters rsigDesc.Init(_countof(rootParameters), rootParameters, 0, nullptr, rootSignatureFlags); @@ -382,7 +382,7 @@ BasicEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effect assert(mRootSignature != 0); - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( (effectFlags & EffectFlags::PerPixelLightingBit) != 0, (effectFlags & EffectFlags::VertexColor) != 0); @@ -398,7 +398,7 @@ BasicEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effect mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"BasicEffect"); } diff --git a/Kits/DirectXTK12/Src/BasicPostProcess.cpp b/Kits/DirectXTK12/Src/BasicPostProcess.cpp new file mode 100644 index 00000000..b5ce20dc --- /dev/null +++ b/Kits/DirectXTK12/Src/BasicPostProcess.cpp @@ -0,0 +1,590 @@ +//-------------------------------------------------------------------------------------- +// File: BasicPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "EffectPipelineStateDescription.h" +#include "GraphicsMemory.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int c_MaxSamples = 16; + + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + + const int RootSignatureCount = 2; + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct PostProcessConstants + { + XMVECTOR sampleOffsets[c_MaxSamples]; + XMVECTOR sampleWeights[c_MaxSamples]; + }; + + static_assert((sizeof(PostProcessConstants) % 16) == 0, "CB size not padded correctly"); + + // 2-parameter Gaussian distribution given standard deviation (rho) + inline float GaussianDistribution(float x, float y, float rho) + { + return expf(-(x * x + y * y) / (2 * rho * rho)) / sqrtf(2 * XM_PI * rho * rho); + } +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOnePostProcess_VSQuadNoCB.inc" + #include "Shaders/Compiled/XboxOnePostProcess_VSQuad.inc" + + #include "Shaders/Compiled/XboxOnePostProcess_PSCopy.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSMonochrome.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSSepia.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSDownScale2x2.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSDownScale4x4.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSGaussianBlur5x5.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomExtract.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomBlur.inc" +#else + #include "Shaders/Compiled/PostProcess_VSQuadNoCB.inc" + #include "Shaders/Compiled/PostProcess_VSQuad.inc" + + #include "Shaders/Compiled/PostProcess_PSCopy.inc" + #include "Shaders/Compiled/PostProcess_PSMonochrome.inc" + #include "Shaders/Compiled/PostProcess_PSSepia.inc" + #include "Shaders/Compiled/PostProcess_PSDownScale2x2.inc" + #include "Shaders/Compiled/PostProcess_PSDownScale4x4.inc" + #include "Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc" + #include "Shaders/Compiled/PostProcess_PSBloomExtract.inc" + #include "Shaders/Compiled/PostProcess_PSBloomBlur.inc" +#endif +} + +namespace +{ + const D3D12_SHADER_BYTECODE vertexShader[] = + { + { PostProcess_VSQuadNoCB, sizeof(PostProcess_VSQuadNoCB) }, + { PostProcess_VSQuad, sizeof(PostProcess_VSQuad) }, + }; + + const D3D12_SHADER_BYTECODE pixelShaders[] = + { + { PostProcess_PSCopy, sizeof(PostProcess_PSCopy) }, + { PostProcess_PSMonochrome, sizeof(PostProcess_PSMonochrome) }, + { PostProcess_PSSepia, sizeof(PostProcess_PSSepia) }, + { PostProcess_PSDownScale2x2, sizeof(PostProcess_PSDownScale2x2) }, + { PostProcess_PSDownScale4x4, sizeof(PostProcess_PSDownScale4x4) }, + { PostProcess_PSGaussianBlur5x5, sizeof(PostProcess_PSGaussianBlur5x5) }, + { PostProcess_PSBloomExtract, sizeof(PostProcess_PSBloomExtract) }, + { PostProcess_PSBloomBlur, sizeof(PostProcess_PSBloomBlur) }, + }; + + static_assert(_countof(pixelShaders) == BasicPostProcess::Effect_Max, "array/max mismatch"); + + // Factory for lazily instantiating shared root signatures. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D12Device* device) + : mDevice(device) + { } + + ID3D12RootSignature* GetRootSignature(int slot, const D3D12_ROOT_SIGNATURE_DESC& desc) + { + assert(slot >= 0 && slot < RootSignatureCount); + _Analysis_assume_(slot >= 0 && slot < RootSignatureCount); + + return DemandCreate(mRootSignature[slot], mMutex, [&](ID3D12RootSignature** pResult) -> HRESULT + { + HRESULT hr = CreateRootSignature(mDevice.Get(), &desc, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, L"BasicPostProcess"); + + return hr; + }); + } + + protected: + ComPtr mDevice; + Microsoft::WRL::ComPtr mRootSignature[RootSignatureCount]; + std::mutex mMutex; + }; +} + +class BasicPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx); + + void Process(_In_ ID3D12GraphicsCommandList* commandList); + + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + enum RootParameterIndex + { + TextureSRV, + ConstantBuffer, + RootParameterCount + }; + + // Fields. + BasicPostProcess::Effect fx; + PostProcessConstants constants; + D3D12_GPU_DESCRIPTOR_HANDLE texture; + unsigned texWidth; + unsigned texHeight; + float guassianMultiplier; + float bloomSize; + float bloomBrightness; + float bloomThreshold; + bool bloomHorizontal; + +private: + bool mUseConstants; + int mDirtyFlags; + + void DownScale2x2(); + void DownScale4x4(); + void GaussianBlur5x5(float multiplier); + void Bloom(bool horizontal, float size, float brightness); + + // D3D constant buffer holds a copy of the same data as the public 'constants' field. + GraphicsResource mConstantBuffer; + + // Per instance cache of PSOs, populated with variants for each shader & layout + Microsoft::WRL::ComPtr mPipelineState; + + // Per instance root signature + ID3D12RootSignature* mRootSignature; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device BasicPostProcess resources. +SharedResourcePool BasicPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +BasicPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx) + : mDeviceResources(deviceResourcesPool.DemandCreate(device)), + fx(ifx), + texWidth(0), + texHeight(0), + guassianMultiplier(1.f), + bloomSize(1.f), + bloomBrightness(1.f), + bloomThreshold(0.25f), + bloomHorizontal(true), + mDirtyFlags(INT_MAX), + constants{}, + texture{} +{ + if (ifx < 0 || ifx >= Effect_Max) + throw std::out_of_range("Effect not defined"); + + switch (ifx) + { + case Copy: + case Monochrome: + case Sepia: + // These shaders don't use the constant buffer + mUseConstants = false; + break; + + default: + mUseConstants = true; + break; + } + + // Create root signature. + { + D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = + D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; + + CD3DX12_DESCRIPTOR_RANGE textureSRVs(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); + + // Same as CommonStates::StaticLinearClamp + CD3DX12_STATIC_SAMPLER_DESC sampler( + 0, // register + D3D12_FILTER_MIN_MAG_MIP_LINEAR, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + 0.f, + 16, + D3D12_COMPARISON_FUNC_LESS_EQUAL, + D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE, + 0.f, + D3D12_FLOAT32_MAX, + D3D12_SHADER_VISIBILITY_PIXEL); + + CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRVs, D3D12_SHADER_VISIBILITY_PIXEL); + + // Root parameter descriptor - conditionally initialized + CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; + + if (mUseConstants) + { + // Include constant buffer + rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_PIXEL); + + // use all parameters + rsigDesc.Init(_countof(rootParameters), rootParameters, 1, &sampler, rootSignatureFlags); + + mRootSignature = mDeviceResources->GetRootSignature(1, rsigDesc); + } + else + { + // only use constant + rsigDesc.Init(1, rootParameters, 1, &sampler, rootSignatureFlags); + + mRootSignature = mDeviceResources->GetRootSignature(0, rsigDesc); + } + } + + assert(mRootSignature != 0); + + // Create pipeline state. + EffectPipelineStateDescription psd(nullptr, + CommonStates::Opaque, + CommonStates::DepthNone, + CommonStates::CullNone, + rtState, + D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE); + + psd.CreatePipelineState( + device, + mRootSignature, + vertexShader[mUseConstants ? 1 : 0], + pixelShaders[ifx], + mPipelineState.GetAddressOf()); + + SetDebugObjectName(mPipelineState.Get(), L"BasicPostProcess"); +} + + +// Sets our state onto the D3D device. +void BasicPostProcess::Impl::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + // Set the root signature. + commandList->SetGraphicsRootSignature(mRootSignature); + + // Set the texture. + if (!texture.ptr) + { + DebugTrace("ERROR: Missing texture for BasicPostProcess (texture %llu)\n", texture.ptr); + throw std::exception("BasicPostProcess"); + } + commandList->SetGraphicsRootDescriptorTable(RootParameterIndex::TextureSRV, texture); + + // Set constants. + if (mUseConstants) + { + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + switch (fx) + { + case DownScale_2x2: + DownScale2x2(); + break; + + case DownScale_4x4: + DownScale4x4(); + break; + + case GaussianBlur_5x5: + GaussianBlur5x5(guassianMultiplier); + break; + + case BloomExtract: + constants.sampleWeights[0] = XMVectorReplicate(bloomThreshold); + break; + + case BloomBlur: + Bloom(bloomHorizontal, bloomSize, bloomBrightness); + break; + } + } + + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer = GraphicsMemory::Get().AllocateConstant(constants); + } + + commandList->SetGraphicsRootConstantBufferView(RootParameterIndex::ConstantBuffer, mConstantBuffer.GpuAddress()); + } + + // Set the pipeline state. + commandList->SetPipelineState(mPipelineState.Get()); + + // Draw quad. + commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + commandList->DrawInstanced(4, 1, 0, 0); +} + + +void BasicPostProcess::Impl::DownScale2x2() +{ + mUseConstants = true; + + if ( !texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + // Sample from the 4 surrounding points. Since the center point will be in the exact + // center of 4 texels, a 0.5f offset is needed to specify a texel center. + auto ptr = reinterpret_cast(constants.sampleOffsets); + for (int y = 0; y < 2; ++y) + { + for (int x = 0; x < 2; ++x) + { + ptr->x = (float(x) - 0.5f) * tu; + ptr->y = (float(y) - 0.5f) * tv; + ++ptr; + } + } + +} + + +void BasicPostProcess::Impl::DownScale4x4() +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + // Sample from the 16 surrounding points. Since the center point will be in the + // exact center of 16 texels, a 1.5f offset is needed to specify a texel center. + auto ptr = reinterpret_cast(constants.sampleOffsets); + for (int y = 0; y < 4; ++y) + { + for (int x = 0; x < 4; ++x) + { + ptr->x = (float(x) - 1.5f) * tu; + ptr->y = (float(y) - 1.5f) * tv; + ++ptr; + } + } + +} + + +void BasicPostProcess::Impl::GaussianBlur5x5(float multiplier) +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 1.0f / float(texWidth); + float tv = 1.0f / float(texHeight); + + float totalWeight = 0.0f; + size_t index = 0; + auto offsets = reinterpret_cast(constants.sampleOffsets); + auto weights = constants.sampleWeights; + for (int x = -2; x <= 2; ++x) + { + for (int y = -2; y <= 2; ++y) + { + // Exclude pixels with a block distance greater than 2. This will + // create a kernel which approximates a 5x5 kernel using only 13 + // sample points instead of 25; this is necessary since 2.0 shaders + // only support 16 texture grabs. + if (fabs(float(x)) + fabs(float(y)) > 2.0f) + continue; + + // Get the unscaled Gaussian intensity for this offset + offsets[index].x = float(x) * tu; + offsets[index].y = float(y) * tv; + offsets[index].z = 0.0f; + offsets[index].w = 0.0f; + + float g = GaussianDistribution(float(x), float(y), 1.0f); + weights[index] = XMVectorReplicate(g); + + totalWeight += XMVectorGetX(weights[index]); + + ++index; + } + } + + // Divide the current weight by the total weight of all the samples; Gaussian + // blur kernels add to 1.0f to ensure that the intensity of the image isn't + // changed when the blur occurs. An optional multiplier variable is used to + // add or remove image intensity during the blur. + for (size_t i = 0; i < index; ++i) + { + weights[i] /= totalWeight; + weights[i] *= multiplier; + } +} + + +void BasicPostProcess::Impl::Bloom(bool horizontal, float size, float brightness) +{ + mUseConstants = true; + + if (!texWidth || !texHeight) + { + throw std::exception("Call SetSourceTexture before setting post-process effect"); + } + + float tu = 0.f; + float tv = 0.f; + if (horizontal) + { + tu = 1.f / float(texWidth); + } + else + { + tv = 1.f / float(texHeight); + } + + auto weights = reinterpret_cast(constants.sampleWeights); + auto offsets = reinterpret_cast(constants.sampleOffsets); + + // Fill the center texel + float weight = brightness * GaussianDistribution(0, 0, size); + weights[0] = XMFLOAT4(weight, weight, weight, 1.0f); + offsets[0].x = offsets[0].y = offsets[0].z = offsets[0].w = 0.f; + + // Fill the first half + for (int i = 1; i < 8; ++i) + { + // Get the Gaussian intensity for this offset + weight = brightness * GaussianDistribution(float(i), 0, size); + weights[i] = XMFLOAT4(weight, weight, weight, 1.0f); + offsets[i] = XMFLOAT4(float(i) * tu, float(i) * tv, 0.f, 0.f); + } + + // Mirror to the second half + for (int i = 8; i < 15; i++) + { + weights[i] = weights[i - 7]; + offsets[i] = XMFLOAT4(-offsets[i - 7].x, -offsets[i - 7].y, 0.f, 0.f); + } +} + + +// Public constructor. +BasicPostProcess::BasicPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect fx) + : pImpl(new Impl(device, rtState, fx)) +{ +} + + +// Move constructor. +BasicPostProcess::BasicPostProcess(BasicPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +BasicPostProcess& BasicPostProcess::operator= (BasicPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +BasicPostProcess::~BasicPostProcess() +{ +} + + +// IPostProcess methods. +void BasicPostProcess::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + pImpl->Process(commandList); +} + + +// Properties +void BasicPostProcess::SetSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor, _In_opt_ ID3D12Resource* resource) +{ + pImpl->texture = srvDescriptor; + + if (resource) + { + auto desc = resource->GetDesc(); + pImpl->texWidth = static_cast(desc.Width); + pImpl->texHeight = desc.Height; + } + else + { + pImpl->texWidth = pImpl->texHeight = 0; + } +} + + +void BasicPostProcess::SetGaussianParameter(float multiplier) +{ + pImpl->guassianMultiplier = multiplier; + pImpl->SetDirtyFlag(); +} + + +void BasicPostProcess::SetBloomExtractParameter(float threshold) +{ + pImpl->bloomThreshold = threshold; + pImpl->SetDirtyFlag(); +} + + +void BasicPostProcess::SetBloomBlurParameters(bool horizontal, float size, float brightness) +{ + pImpl->bloomSize = size; + pImpl->bloomBrightness = brightness; + pImpl->bloomHorizontal = horizontal; + pImpl->SetDirtyFlag(); +} \ No newline at end of file diff --git a/Kits/DirectXTK12/Src/DualPostProcess.cpp b/Kits/DirectXTK12/Src/DualPostProcess.cpp new file mode 100644 index 00000000..5a26231d --- /dev/null +++ b/Kits/DirectXTK12/Src/DualPostProcess.cpp @@ -0,0 +1,352 @@ +//-------------------------------------------------------------------------------------- +// File: DualPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "EffectPipelineStateDescription.h" +#include "GraphicsMemory.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int c_MaxSamples = 16; + + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct PostProcessConstants + { + XMVECTOR sampleOffsets[c_MaxSamples]; + XMVECTOR sampleWeights[c_MaxSamples]; + }; + + static_assert((sizeof(PostProcessConstants) % 16) == 0, "CB size not padded correctly"); +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOnePostProcess_VSQuadDual.inc" + + #include "Shaders/Compiled/XboxOnePostProcess_PSMerge.inc" + #include "Shaders/Compiled/XboxOnePostProcess_PSBloomCombine.inc" +#else + #include "Shaders/Compiled/PostProcess_VSQuadDual.inc" + + #include "Shaders/Compiled/PostProcess_PSMerge.inc" + #include "Shaders/Compiled/PostProcess_PSBloomCombine.inc" +#endif +} + +namespace +{ + const D3D12_SHADER_BYTECODE vertexShader = + { PostProcess_VSQuadDual, sizeof(PostProcess_VSQuadDual) }; + + const D3D12_SHADER_BYTECODE pixelShaders[] = + { + { PostProcess_PSMerge, sizeof(PostProcess_PSMerge) }, + { PostProcess_PSBloomCombine, sizeof(PostProcess_PSBloomCombine) }, + }; + + static_assert(_countof(pixelShaders) == DualPostProcess::Effect_Max, "array/max mismatch"); + + // Factory for lazily instantiating shared root signatures. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D12Device* device) + : mDevice(device) + { } + + ID3D12RootSignature* GetRootSignature(const D3D12_ROOT_SIGNATURE_DESC& desc) + { + return DemandCreate(mRootSignature, mMutex, [&](ID3D12RootSignature** pResult) -> HRESULT + { + HRESULT hr = CreateRootSignature(mDevice.Get(), &desc, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, L"DualPostProcess"); + + return hr; + }); + } + + protected: + ComPtr mDevice; + Microsoft::WRL::ComPtr mRootSignature; + std::mutex mMutex; + }; +} + +class DualPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx); + + void Process(_In_ ID3D12GraphicsCommandList* commandList); + + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + enum RootParameterIndex + { + TextureSRV, + TextureSRV2, + ConstantBuffer, + RootParameterCount + }; + + // Fields. + DualPostProcess::Effect fx; + PostProcessConstants constants; + D3D12_GPU_DESCRIPTOR_HANDLE texture; + D3D12_GPU_DESCRIPTOR_HANDLE texture2; + float mergeWeight1; + float mergeWeight2; + float bloomIntensity; + float bloomBaseIntensity; + float bloomSaturation; + float bloomBaseSaturation; + +private: + int mDirtyFlags; + + // D3D constant buffer holds a copy of the same data as the public 'constants' field. + GraphicsResource mConstantBuffer; + + // Per instance cache of PSOs, populated with variants for each shader & layout + Microsoft::WRL::ComPtr mPipelineState; + + // Per instance root signature + ID3D12RootSignature* mRootSignature; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device DualPostProcess resources. +SharedResourcePool DualPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +DualPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx) + : mDeviceResources(deviceResourcesPool.DemandCreate(device)), + fx(ifx), + mergeWeight1(0.5f), + mergeWeight2(0.5f), + bloomIntensity(1.25f), + bloomBaseIntensity(1.f), + bloomSaturation(1.f), + bloomBaseSaturation(1.f), + mDirtyFlags(INT_MAX), + constants{}, + texture{}, + texture2{} +{ + if (ifx < 0 || ifx >= Effect_Max) + throw std::out_of_range("Effect not defined"); + + // Create root signature. + { + D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = + D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; + + // Same as CommonStates::StaticLinearClamp + CD3DX12_STATIC_SAMPLER_DESC sampler( + 0, // register + D3D12_FILTER_MIN_MAG_MIP_LINEAR, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + 0.f, + 16, + D3D12_COMPARISON_FUNC_LESS_EQUAL, + D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE, + 0.f, + D3D12_FLOAT32_MAX, + D3D12_SHADER_VISIBILITY_PIXEL); + + CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; + + CD3DX12_DESCRIPTOR_RANGE texture1Range(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &texture1Range, D3D12_SHADER_VISIBILITY_PIXEL); + + CD3DX12_DESCRIPTOR_RANGE texture2Range(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1); + rootParameters[RootParameterIndex::TextureSRV2].InitAsDescriptorTable(1, &texture2Range, D3D12_SHADER_VISIBILITY_PIXEL); + + // Root parameter descriptor + CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; + + // Constant buffer + rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_PIXEL); + + rsigDesc.Init(_countof(rootParameters), rootParameters, 1, &sampler, rootSignatureFlags); + + mRootSignature = mDeviceResources->GetRootSignature(rsigDesc); + } + + assert(mRootSignature != 0); + + // Create pipeline state. + EffectPipelineStateDescription psd(nullptr, + CommonStates::Opaque, + CommonStates::DepthNone, + CommonStates::CullNone, + rtState, + D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE); + + psd.CreatePipelineState( + device, + mRootSignature, + vertexShader, + pixelShaders[ifx], + mPipelineState.GetAddressOf()); + + SetDebugObjectName(mPipelineState.Get(), L"DualPostProcess"); +} + + +// Sets our state onto the D3D device. +void DualPostProcess::Impl::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + // Set the root signature. + commandList->SetGraphicsRootSignature(mRootSignature); + + // Set the texture. + if (!texture.ptr || !texture2.ptr) + { + DebugTrace("ERROR: Missing texture(s) for DualPostProcess (%llu, %llu)\n", texture.ptr, texture2.ptr); + throw std::exception("DualPostProcess"); + } + commandList->SetGraphicsRootDescriptorTable(RootParameterIndex::TextureSRV, texture); + commandList->SetGraphicsRootDescriptorTable(RootParameterIndex::TextureSRV2, texture2); + + // Set constants. + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + switch (fx) + { + case Merge: + constants.sampleWeights[0] = XMVectorReplicate(mergeWeight1); + constants.sampleWeights[1] = XMVectorReplicate(mergeWeight2); + break; + + case BloomCombine: + constants.sampleWeights[0] = XMVectorSet(bloomBaseSaturation, bloomSaturation, 0.f, 0.f); + constants.sampleWeights[1] = XMVectorReplicate(bloomBaseIntensity); + constants.sampleWeights[2] = XMVectorReplicate(bloomIntensity); + break; + } + } + + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer = GraphicsMemory::Get().AllocateConstant(constants); + } + + commandList->SetGraphicsRootConstantBufferView(RootParameterIndex::ConstantBuffer, mConstantBuffer.GpuAddress()); + + // Set the pipeline state. + commandList->SetPipelineState(mPipelineState.Get()); + + // Draw quad. + commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + commandList->DrawInstanced(4, 1, 0, 0); +} + + +// Public constructor. +DualPostProcess::DualPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect fx) + : pImpl(new Impl(device, rtState, fx)) +{ +} + + +// Move constructor. +DualPostProcess::DualPostProcess(DualPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +DualPostProcess& DualPostProcess::operator= (DualPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +DualPostProcess::~DualPostProcess() +{ +} + + +// IPostProcess methods. +void DualPostProcess::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + pImpl->Process(commandList); +} + + +// Properties +void DualPostProcess::SetSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor) +{ + pImpl->texture = srvDescriptor; +} + + +void DualPostProcess::SetSourceTexture2(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor) +{ + pImpl->texture2 = srvDescriptor; +} + + +void DualPostProcess::SetMergeParameters(float weight1, float weight2) +{ + pImpl->mergeWeight1 = weight1; + pImpl->mergeWeight2 = weight2; + pImpl->SetDirtyFlag(); +} + + +void DualPostProcess::SetBloomCombineParameters(float bloom, float base, float bloomSaturation, float baseSaturation) +{ + pImpl->bloomIntensity = bloom; + pImpl->bloomBaseIntensity = base; + pImpl->bloomSaturation = bloomSaturation; + pImpl->bloomBaseSaturation = baseSaturation; + pImpl->SetDirtyFlag(); +} diff --git a/Kits/DirectXTK12/Src/DualTextureEffect.cpp b/Kits/DirectXTK12/Src/DualTextureEffect.cpp index 44c6a67c..d28e2214 100644 --- a/Kits/DirectXTK12/Src/DualTextureEffect.cpp +++ b/Kits/DirectXTK12/Src/DualTextureEffect.cpp @@ -147,10 +147,10 @@ DualTextureEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const static_assert(_countof(EffectBase::PixelShaderBytecode) == DualTextureEffectTraits::PixelShaderCount, "array/max mismatch"); static_assert(_countof(EffectBase::PixelShaderIndices) == DualTextureEffectTraits::ShaderPermutationCount, "array/max mismatch"); - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; @@ -161,14 +161,14 @@ DualTextureEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const // Texture 1 CD3DX12_DESCRIPTOR_RANGE texture1Range(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); CD3DX12_DESCRIPTOR_RANGE texture1SamplerRange(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); - rootParameters[RootParameterIndex::Texture1SRV].InitAsDescriptorTable(1, &texture1Range); - rootParameters[RootParameterIndex::Texture1Sampler].InitAsDescriptorTable(1, &texture1SamplerRange); + rootParameters[RootParameterIndex::Texture1SRV].InitAsDescriptorTable(1, &texture1Range, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::Texture1Sampler].InitAsDescriptorTable(1, &texture1SamplerRange, D3D12_SHADER_VISIBILITY_PIXEL); // Texture 2 CD3DX12_DESCRIPTOR_RANGE texture2Range(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1); CD3DX12_DESCRIPTOR_RANGE texture2SamplerRange(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1); - rootParameters[RootParameterIndex::Texture2SRV].InitAsDescriptorTable(1, &texture2Range); - rootParameters[RootParameterIndex::Texture2Sampler].InitAsDescriptorTable(1, &texture2SamplerRange); + rootParameters[RootParameterIndex::Texture2SRV].InitAsDescriptorTable(1, &texture2Range, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::Texture2Sampler].InitAsDescriptorTable(1, &texture2SamplerRange, D3D12_SHADER_VISIBILITY_PIXEL); // Create the root signature CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; @@ -179,7 +179,7 @@ DualTextureEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const assert(mRootSignature != 0); - // Validate flags & state + // Validate flags & state. fog.enabled = (effectFlags & EffectFlags::Fog) != 0; if (effectFlags & EffectFlags::PerPixelLightingBit) @@ -193,7 +193,7 @@ DualTextureEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const throw std::invalid_argument("DualTextureEffect"); } - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( (effectFlags & EffectFlags::VertexColor) != 0); assert(sp >= 0 && sp < DualTextureEffectTraits::ShaderPermutationCount); @@ -208,7 +208,7 @@ DualTextureEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"DualTextureEffect"); } diff --git a/Kits/DirectXTK12/Src/EffectCommon.cpp b/Kits/DirectXTK12/Src/EffectCommon.cpp index d4e630d0..900900c8 100644 --- a/Kits/DirectXTK12/Src/EffectCommon.cpp +++ b/Kits/DirectXTK12/Src/EffectCommon.cpp @@ -375,7 +375,7 @@ void EffectLights::EnableDefaultLighting(_In_ IEffectLights* effect) } -// Gets or lazily creates the specified root signature +// Gets or lazily creates the specified root signature. ID3D12RootSignature* EffectDeviceResources::DemandCreateRootSig(_Inout_ Microsoft::WRL::ComPtr& rootSig, D3D12_ROOT_SIGNATURE_DESC const& desc) { return DemandCreate(rootSig, mMutex, [&](ID3D12RootSignature** pResult) -> HRESULT diff --git a/Kits/DirectXTK12/Src/EffectCommon.h b/Kits/DirectXTK12/Src/EffectCommon.h index adec7dbb..3a723bc5 100644 --- a/Kits/DirectXTK12/Src/EffectCommon.h +++ b/Kits/DirectXTK12/Src/EffectCommon.h @@ -121,8 +121,7 @@ namespace DirectX static void EnableDefaultLighting(_In_ IEffectLights* effect); }; - // Factory for lazily instantiating shaders. BasicEffect supports many different - // shader permutations, so we only bother creating the ones that are actually used. + // Factory for lazily instantiating shared root signatures. class EffectDeviceResources { public: diff --git a/Kits/DirectXTK12/Src/EnvironmentMapEffect.cpp b/Kits/DirectXTK12/Src/EnvironmentMapEffect.cpp index ae8846fb..aca2ea1a 100644 --- a/Kits/DirectXTK12/Src/EnvironmentMapEffect.cpp +++ b/Kits/DirectXTK12/Src/EnvironmentMapEffect.cpp @@ -244,32 +244,28 @@ EnvironmentMapEffect::Impl::Impl( static_assert( _countof(EffectBase::PixelShaderBytecode) == EnvironmentMapEffectTraits::PixelShaderCount, "array/max mismatch" ); static_assert( _countof(EffectBase::PixelShaderIndices) == EnvironmentMapEffectTraits::ShaderPermutationCount, "array/max mismatch" ); - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; - CD3DX12_STATIC_SAMPLER_DESC samplers[2]; - samplers[0] = CD3DX12_STATIC_SAMPLER_DESC(0); - samplers[1] = CD3DX12_STATIC_SAMPLER_DESC(1); - CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); // Texture 1 CD3DX12_DESCRIPTOR_RANGE textureDescriptor(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); CD3DX12_DESCRIPTOR_RANGE textureSamplerDescriptor(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureDescriptor); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerDescriptor); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureDescriptor, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerDescriptor, D3D12_SHADER_VISIBILITY_PIXEL); // Texture 2 CD3DX12_DESCRIPTOR_RANGE cubemapDescriptor(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1); CD3DX12_DESCRIPTOR_RANGE cubemapSamplerDescriptor(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1); - rootParameters[RootParameterIndex::CubemapSRV].InitAsDescriptorTable(1, &cubemapDescriptor); - rootParameters[RootParameterIndex::CubemapSampler].InitAsDescriptorTable(1, &cubemapSamplerDescriptor); + rootParameters[RootParameterIndex::CubemapSRV].InitAsDescriptorTable(1, &cubemapDescriptor, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::CubemapSampler].InitAsDescriptorTable(1, &cubemapSamplerDescriptor, D3D12_SHADER_VISIBILITY_PIXEL); // Create the root signature CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; @@ -297,7 +293,7 @@ EnvironmentMapEffect::Impl::Impl( lights.InitializeConstants(unwantedOutput[0], constants.lightDirection, constants.lightDiffuseColor, unwantedOutput); - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( fresnelEnabled, specularEnabled, @@ -314,7 +310,7 @@ EnvironmentMapEffect::Impl::Impl( mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"EnvironmentMapEffect"); } diff --git a/Kits/DirectXTK12/Src/ModelLoadSDKMESH.cpp b/Kits/DirectXTK12/Src/ModelLoadSDKMESH.cpp index 3076ac1d..f733357c 100644 --- a/Kits/DirectXTK12/Src/ModelLoadSDKMESH.cpp +++ b/Kits/DirectXTK12/Src/ModelLoadSDKMESH.cpp @@ -103,21 +103,31 @@ namespace m.enableNormalMaps = (flags & NORMAL_MAPS) != 0; m.biasedVertexNormals = (flags & BIASED_VERTEX_NORMALS) != 0; - m.ambientColor = XMFLOAT3(mh.Ambient.x, mh.Ambient.y, mh.Ambient.z); - m.diffuseColor = XMFLOAT3(mh.Diffuse.x, mh.Diffuse.y, mh.Diffuse.z); - m.emissiveColor = XMFLOAT3(mh.Emissive.x, mh.Emissive.y, mh.Emissive.z); - - if (mh.Diffuse.w != 1.f && mh.Diffuse.w != 0.f) + if (mh.Ambient.x == 0 && mh.Ambient.y == 0 && mh.Ambient.z == 0 && mh.Ambient.w == 0 + && mh.Diffuse.x == 0 && mh.Diffuse.y == 0 && mh.Diffuse.z == 0 && mh.Diffuse.w == 0) { - m.alphaValue = mh.Diffuse.w; + // SDKMESH material color block is uninitalized; assume defaults + m.diffuseColor = XMFLOAT3(1.f, 1.f, 1.f); + m.alphaValue = 1.f; } else - m.alphaValue = 1.f; - - if (mh.Power) { - m.specularPower = mh.Power; - m.specularColor = XMFLOAT3(mh.Specular.x, mh.Specular.y, mh.Specular.z); + m.ambientColor = XMFLOAT3(mh.Ambient.x, mh.Ambient.y, mh.Ambient.z); + m.diffuseColor = XMFLOAT3(mh.Diffuse.x, mh.Diffuse.y, mh.Diffuse.z); + m.emissiveColor = XMFLOAT3(mh.Emissive.x, mh.Emissive.y, mh.Emissive.z); + + if (mh.Diffuse.w != 1.f && mh.Diffuse.w != 0.f) + { + m.alphaValue = mh.Diffuse.w; + } + else + m.alphaValue = 1.f; + + if (mh.Power) + { + m.specularPower = mh.Power; + m.specularColor = XMFLOAT3(mh.Specular.x, mh.Specular.y, mh.Specular.z); + } } m.diffuseTextureIndex = GetUniqueTextureIndex(diffuseName, textureDictionary); diff --git a/Kits/DirectXTK12/Src/NormalMapEffect.cpp b/Kits/DirectXTK12/Src/NormalMapEffect.cpp index fc486bee..1707eed9 100644 --- a/Kits/DirectXTK12/Src/NormalMapEffect.cpp +++ b/Kits/DirectXTK12/Src/NormalMapEffect.cpp @@ -214,23 +214,23 @@ NormalMapEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Ef lights.InitializeConstants(constants.specularColorAndPower, constants.lightDirection, constants.lightDiffuseColor, constants.lightSpecularColor); - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; CD3DX12_DESCRIPTOR_RANGE textureSRV(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV, D3D12_SHADER_VISIBILITY_PIXEL); CD3DX12_DESCRIPTOR_RANGE textureSRV2(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1); - rootParameters[RootParameterIndex::TextureNormalSRV].InitAsDescriptorTable(1, &textureSRV2); + rootParameters[RootParameterIndex::TextureNormalSRV].InitAsDescriptorTable(1, &textureSRV2, D3D12_SHADER_VISIBILITY_PIXEL); CD3DX12_DESCRIPTOR_RANGE textureSampler(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler, D3D12_SHADER_VISIBILITY_PIXEL); rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; @@ -238,7 +238,7 @@ NormalMapEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Ef if (specularMap) { CD3DX12_DESCRIPTOR_RANGE textureSRV3(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 2); - rootParameters[RootParameterIndex::TextureSpecularSRV].InitAsDescriptorTable(1, &textureSRV3); + rootParameters[RootParameterIndex::TextureSpecularSRV].InitAsDescriptorTable(1, &textureSRV3, D3D12_SHADER_VISIBILITY_PIXEL); rsigDesc.Init(_countof(rootParameters), rootParameters, 0, nullptr, rootSignatureFlags); @@ -257,7 +257,7 @@ NormalMapEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Ef fog.enabled = (effectFlags & EffectFlags::Fog) != 0; biasedVertexNormals = (effectFlags & EffectFlags::BiasedVertexNormals) != 0; - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( (effectFlags & EffectFlags::VertexColor) != 0); assert(sp >= 0 && sp < NormalMapEffectTraits::ShaderPermutationCount); @@ -272,7 +272,7 @@ NormalMapEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Ef mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"NormalMapEffect"); } diff --git a/Kits/DirectXTK12/Src/ScreenGrab.cpp b/Kits/DirectXTK12/Src/ScreenGrab.cpp index d59aea49..1782c31c 100644 --- a/Kits/DirectXTK12/Src/ScreenGrab.cpp +++ b/Kits/DirectXTK12/Src/ScreenGrab.cpp @@ -713,7 +713,7 @@ HRESULT DirectX::SaveWICTextureToFile( return E_UNEXPECTED; } - hr = FC->Initialize(source.Get(), targetGuid, WICBitmapDitherTypeNone, 0, 0, WICBitmapPaletteTypeCustom); + hr = FC->Initialize(source.Get(), targetGuid, WICBitmapDitherTypeNone, nullptr, 0, WICBitmapPaletteTypeMedianCut); if (FAILED(hr)) { pStaging->Unmap(0, &writeRange); diff --git a/Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd b/Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd index d0b2aea8..1cb8c045 100644 --- a/Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd +++ b/Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd @@ -137,7 +137,44 @@ call :CompileShader%1 SpriteEffect ps SpritePixelShader call :CompileShader%1 SpriteEffect vs SpriteVertexShaderHeap call :CompileShader%1 SpriteEffect ps SpritePixelShaderHeap +call :CompileShader%1 PostProcess vs VSQuad +call :CompileShader%1 PostProcess vs VSQuadNoCB +call :CompileShader%1 PostProcess vs VSQuadDual +call :CompileShader%1 PostProcess ps PSCopy +call :CompileShader%1 PostProcess ps PSMonochrome +call :CompileShader%1 PostProcess ps PSSepia +call :CompileShader%1 PostProcess ps PSDownScale2x2 +call :CompileShader%1 PostProcess ps PSDownScale4x4 +call :CompileShader%1 PostProcess ps PSGaussianBlur5x5 +call :CompileShader%1 PostProcess ps PSBloomExtract +call :CompileShader%1 PostProcess ps PSBloomBlur +call :CompileShader%1 PostProcess ps PSMerge +call :CompileShader%1 PostProcess ps PSBloomCombine + call :CompileComputeShader%1 GenerateMips main + +call :CompileShader%1 ToneMap vs VSQuad +call :CompileShader%1 ToneMap ps PSCopy +call :CompileShader%1 ToneMap ps PSSaturate +call :CompileShader%1 ToneMap ps PSReinhard +call :CompileShader%1 ToneMap ps PSACESFilmic +call :CompileShader%1 ToneMap ps PS_SRGB +call :CompileShader%1 ToneMap ps PSSaturate_SRGB +call :CompileShader%1 ToneMap ps PSReinhard_SRGB +call :CompileShader%1 ToneMap ps PSACESFilmic_SRGB +call :CompileShader%1 ToneMap ps PSHDR10 + +if NOT %1.==xbox. goto skipxboxonly + +call :CompileShaderxbox ToneMap ps PSHDR10_Saturate +call :CompileShaderxbox ToneMap ps PSHDR10_Reinhard +call :CompileShaderxbox ToneMap ps PSHDR10_ACESFilmic +call :CompileShaderxbox ToneMap ps PSHDR10_Saturate_SRGB +call :CompileShaderxbox ToneMap ps PSHDR10_Reinhard_SRGB +call :CompileShaderxbox ToneMap ps PSHDR10_ACESFilmic_SRGB + +:skipxboxonly + echo. if %error% == 0 ( diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc index a8ccf739..93e7b164 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc @@ -44,10 +44,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestEqNe[] = { - 68, 88, 66, 67, 6, 187, - 155, 103, 19, 100, 127, 9, - 38, 170, 122, 15, 11, 186, - 227, 242, 1, 0, 0, 0, + 68, 88, 66, 67, 215, 182, + 144, 196, 153, 75, 186, 38, + 210, 179, 82, 159, 14, 222, + 204, 113, 1, 0, 0, 0, 28, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -162,9 +162,9 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNe[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb index baa9c37e..97abf7d9 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc index 1135248e..2e32fb96 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc @@ -40,10 +40,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] = { - 68, 88, 66, 67, 255, 175, - 18, 200, 111, 81, 68, 35, - 208, 109, 127, 114, 236, 68, - 5, 212, 1, 0, 0, 0, + 68, 88, 66, 67, 230, 159, + 34, 36, 151, 171, 215, 123, + 74, 79, 105, 85, 36, 0, + 139, 203, 1, 0, 0, 0, 168, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 0, 0, 0, 180, 0, @@ -139,9 +139,9 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb index 3972ad6e..5423deb5 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc index d9a53ccb..b3c06722 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc @@ -43,10 +43,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestLtGt[] = { - 68, 88, 66, 67, 129, 93, - 197, 65, 211, 237, 60, 40, - 53, 119, 230, 79, 6, 240, - 60, 239, 1, 0, 0, 0, + 68, 88, 66, 67, 226, 36, + 101, 32, 214, 102, 192, 112, + 76, 237, 119, 196, 93, 44, + 226, 106, 1, 0, 0, 0, 236, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -153,9 +153,9 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGt[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb index 068173e9..78693b3b 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc index ad21196d..9d03bc84 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc @@ -39,10 +39,10 @@ ret const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] = { - 68, 88, 66, 67, 112, 205, - 26, 2, 164, 202, 117, 150, - 27, 52, 158, 167, 34, 64, - 152, 185, 1, 0, 0, 0, + 68, 88, 66, 67, 154, 249, + 184, 16, 242, 86, 70, 193, + 53, 175, 47, 56, 145, 165, + 107, 198, 1, 0, 0, 0, 120, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 0, 0, 0, 180, 0, @@ -130,9 +130,9 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb index 3a2a57b6..463453b3 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc index b6fc1b4a..f38252d5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc @@ -43,10 +43,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTest[] = { - 68, 88, 66, 67, 235, 107, - 90, 17, 222, 218, 154, 184, - 61, 35, 90, 170, 238, 229, - 132, 184, 1, 0, 0, 0, + 68, 88, 66, 67, 243, 144, + 230, 203, 113, 194, 86, 74, + 139, 193, 62, 2, 94, 36, + 66, 195, 1, 0, 0, 0, 248, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 136, 0, 0, 0, 20, 1, @@ -155,9 +155,9 @@ const BYTE AlphaTestEffect_VSAlphaTest[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb index 13e6ddb2..6a4cb88f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc index 84599136..669310aa 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.inc @@ -39,10 +39,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestNoFog[] = { - 68, 88, 66, 67, 208, 32, - 196, 237, 197, 58, 171, 227, - 75, 96, 188, 86, 37, 128, - 154, 211, 1, 0, 0, 0, + 68, 88, 66, 67, 53, 110, + 79, 38, 102, 138, 237, 158, + 168, 172, 14, 135, 97, 86, + 42, 229, 1, 0, 0, 0, 148, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 136, 0, 0, 0, 252, 0, @@ -135,9 +135,9 @@ const BYTE AlphaTestEffect_VSAlphaTestNoFog[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb index 1a78cc4c..31bcc8f1 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc index 9a2faea1..f1f58037 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.inc @@ -45,10 +45,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestVc[] = { - 68, 88, 66, 67, 14, 197, - 144, 48, 235, 0, 57, 224, - 112, 178, 79, 123, 43, 201, - 174, 116, 1, 0, 0, 0, + 68, 88, 66, 67, 2, 253, + 150, 27, 102, 172, 212, 77, + 255, 192, 143, 247, 232, 97, + 181, 215, 1, 0, 0, 0, 40, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 48, 1, @@ -165,9 +165,9 @@ const BYTE AlphaTestEffect_VSAlphaTestVc[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb index 58785c1f..f330ac52 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc index dac94bfe..0aca899b 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.inc @@ -41,10 +41,10 @@ ret const BYTE AlphaTestEffect_VSAlphaTestVcNoFog[] = { - 68, 88, 66, 67, 234, 4, - 199, 251, 17, 203, 58, 128, - 15, 118, 66, 117, 146, 215, - 111, 190, 1, 0, 0, 0, + 68, 88, 66, 67, 180, 44, + 36, 177, 149, 36, 154, 184, + 187, 108, 173, 81, 126, 77, + 183, 130, 1, 0, 0, 0, 196, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 24, 1, @@ -145,9 +145,9 @@ const BYTE AlphaTestEffect_VSAlphaTestVcNoFog[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb index c46bf8fe..0eed402f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTestVcNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb index 1cddea2c..a3dc213f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasic.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb index 99ea40fd..ae0ed5a6 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb index 469d5a17..4ace3c6f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc index dff279ff..e4ea1cf4 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.inc @@ -84,10 +84,10 @@ ret const BYTE BasicEffect_PSBasicPixelLightingTx[] = { - 68, 88, 66, 67, 49, 91, - 58, 91, 202, 8, 39, 127, - 144, 91, 27, 25, 62, 176, - 111, 125, 1, 0, 0, 0, + 68, 88, 66, 67, 214, 103, + 65, 248, 100, 121, 63, 224, + 185, 98, 41, 102, 88, 27, + 0, 143, 1, 0, 0, 0, 228, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -406,9 +406,9 @@ const BYTE BasicEffect_PSBasicPixelLightingTx[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb index 401ccec0..00d4471f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc index a230c204..e9514638 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.inc @@ -39,10 +39,10 @@ ret const BYTE BasicEffect_PSBasicTx[] = { - 68, 88, 66, 67, 175, 244, - 128, 86, 7, 247, 254, 150, - 186, 0, 124, 244, 76, 50, - 144, 107, 1, 0, 0, 0, + 68, 88, 66, 67, 147, 115, + 177, 226, 104, 56, 158, 72, + 120, 101, 207, 245, 127, 241, + 131, 246, 1, 0, 0, 0, 120, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -130,9 +130,9 @@ const BYTE BasicEffect_PSBasicTx[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb index 6b83bde6..05c6c19f 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc index d2b882f6..fcec1674 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.inc @@ -33,10 +33,10 @@ ret const BYTE BasicEffect_PSBasicTxNoFog[] = { - 68, 88, 66, 67, 140, 101, - 194, 8, 170, 236, 197, 9, - 80, 208, 204, 5, 221, 74, - 83, 234, 1, 0, 0, 0, + 68, 88, 66, 67, 217, 14, + 178, 95, 82, 101, 246, 138, + 66, 99, 237, 47, 186, 39, + 10, 7, 1, 0, 0, 0, 224, 1, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 0, 0, 0, 180, 0, @@ -99,9 +99,9 @@ const BYTE BasicEffect_PSBasicTxNoFog[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb index a299152f..0dffa54a 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicTxNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb index b4631164..079c3217 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb index fd71bd13..d2c025cb 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc index e0b6b429..8046f4c2 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.inc @@ -40,10 +40,10 @@ ret const BYTE BasicEffect_PSBasicVertexLightingTx[] = { - 68, 88, 66, 67, 56, 32, - 144, 120, 96, 191, 116, 174, - 87, 115, 77, 223, 89, 46, - 247, 192, 1, 0, 0, 0, + 68, 88, 66, 67, 220, 88, + 90, 152, 18, 251, 16, 16, + 2, 68, 38, 92, 143, 10, + 65, 252, 1, 0, 0, 0, 156, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -137,9 +137,9 @@ const BYTE BasicEffect_PSBasicVertexLightingTx[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb index 9a72a239..2361e195 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc index 1f4f477b..7352fe8d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.inc @@ -37,10 +37,10 @@ ret const BYTE BasicEffect_PSBasicVertexLightingTxNoFog[] = { - 68, 88, 66, 67, 187, 166, - 223, 93, 128, 28, 53, 198, - 217, 1, 35, 91, 232, 253, - 156, 11, 1, 0, 0, 0, + 68, 88, 66, 67, 90, 229, + 225, 197, 247, 133, 174, 188, + 147, 170, 2, 248, 40, 215, + 83, 116, 1, 0, 0, 0, 60, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -118,9 +118,9 @@ const BYTE BasicEffect_PSBasicVertexLightingTxNoFog[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb index c4235a4c..751ba9c5 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_PSBasicVertexLightingTxNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb index e317ad30..14b97939 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasic.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb index 6f5755d5..4e7bf071 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb index 00b63cf1..df82afd2 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb index efda990a..fc346897 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc index a6f25865..96a29ebc 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.inc @@ -57,10 +57,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTx[] = { - 68, 88, 66, 67, 121, 194, - 145, 22, 77, 121, 103, 107, - 1, 184, 100, 202, 199, 48, - 21, 47, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 18, + 3, 165, 4, 48, 15, 215, + 72, 212, 255, 68, 72, 190, + 247, 123, 1, 0, 0, 0, 88, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -228,9 +228,9 @@ const BYTE BasicEffect_VSBasicPixelLightingTx[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb index 1334b614..1c261d64 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc index 65aac032..07cad57d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.inc @@ -58,10 +58,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = { - 68, 88, 66, 67, 195, 115, - 214, 51, 213, 218, 137, 60, - 246, 226, 31, 61, 242, 19, - 214, 0, 1, 0, 0, 0, + 68, 88, 66, 67, 181, 212, + 147, 63, 192, 134, 27, 55, + 43, 2, 76, 113, 9, 23, + 122, 47, 1, 0, 0, 0, 148, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -239,9 +239,9 @@ const BYTE BasicEffect_VSBasicPixelLightingTxBn[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb index 888cc179..72a5d671 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc index caa7e760..27b2fcc5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.inc @@ -59,10 +59,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = { - 68, 88, 66, 67, 112, 94, - 47, 213, 184, 112, 240, 18, - 142, 1, 255, 108, 61, 155, - 141, 242, 1, 0, 0, 0, + 68, 88, 66, 67, 140, 160, + 161, 21, 108, 1, 235, 48, + 102, 106, 154, 135, 14, 158, + 144, 180, 1, 0, 0, 0, 128, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 104, 1, @@ -237,9 +237,9 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVc[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb index c17984e7..71499a0a 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc index 093318ed..77708ba9 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.inc @@ -60,10 +60,10 @@ ret const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = { - 68, 88, 66, 67, 222, 11, - 49, 191, 149, 62, 37, 204, - 186, 47, 18, 53, 167, 189, - 147, 220, 1, 0, 0, 0, + 68, 88, 66, 67, 216, 5, + 177, 243, 18, 135, 123, 72, + 216, 122, 74, 95, 11, 203, + 83, 238, 1, 0, 0, 0, 188, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 104, 1, @@ -248,9 +248,9 @@ const BYTE BasicEffect_VSBasicPixelLightingTxVcBn[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb index 500719eb..f3f4c0eb 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb index 0c6229f7..7825c28e 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb index 2cbaee04..b7125f89 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicPixelLightingVcBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc index 090b1517..85bcc48d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.inc @@ -43,10 +43,10 @@ ret const BYTE BasicEffect_VSBasicTx[] = { - 68, 88, 66, 67, 109, 96, - 60, 238, 195, 93, 6, 158, - 132, 255, 74, 177, 228, 193, - 156, 86, 1, 0, 0, 0, + 68, 88, 66, 67, 17, 114, + 241, 63, 27, 71, 107, 32, + 187, 235, 107, 192, 92, 246, + 242, 30, 1, 0, 0, 0, 248, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 136, 0, 0, 0, 20, 1, @@ -155,9 +155,9 @@ const BYTE BasicEffect_VSBasicTx[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb index fc5eacde..4e7ce1ec 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc index 30f346b6..4f44ade5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.inc @@ -39,10 +39,10 @@ ret const BYTE BasicEffect_VSBasicTxNoFog[] = { - 68, 88, 66, 67, 152, 129, - 109, 129, 76, 7, 111, 85, - 215, 224, 17, 223, 63, 202, - 109, 178, 1, 0, 0, 0, + 68, 88, 66, 67, 75, 160, + 156, 215, 105, 145, 57, 105, + 32, 130, 18, 136, 235, 175, + 149, 221, 1, 0, 0, 0, 148, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 136, 0, 0, 0, 252, 0, @@ -135,9 +135,9 @@ const BYTE BasicEffect_VSBasicTxNoFog[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb index 9dca290a..690b05a4 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc index 3e9b6fbd..7fa640d7 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.inc @@ -45,10 +45,10 @@ ret const BYTE BasicEffect_VSBasicTxVc[] = { - 68, 88, 66, 67, 76, 160, - 66, 120, 68, 215, 54, 219, - 121, 169, 213, 88, 112, 132, - 235, 232, 1, 0, 0, 0, + 68, 88, 66, 67, 110, 224, + 83, 150, 140, 95, 137, 216, + 80, 255, 240, 34, 211, 105, + 200, 196, 1, 0, 0, 0, 40, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 48, 1, @@ -165,9 +165,9 @@ const BYTE BasicEffect_VSBasicTxVc[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb index e8bc640f..306ec52c 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc index 9d2dd0b3..a7ccb6d7 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.inc @@ -41,10 +41,10 @@ ret const BYTE BasicEffect_VSBasicTxVcNoFog[] = { - 68, 88, 66, 67, 135, 156, - 37, 126, 134, 96, 65, 227, - 249, 131, 6, 233, 250, 237, - 165, 106, 1, 0, 0, 0, + 68, 88, 66, 67, 11, 247, + 91, 100, 20, 60, 27, 41, + 166, 166, 9, 181, 229, 178, + 101, 102, 1, 0, 0, 0, 196, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 24, 1, @@ -145,9 +145,9 @@ const BYTE BasicEffect_VSBasicTxVcNoFog[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb index a77b40f6..be9688a4 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicTxVcNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb index b8db9dfa..24362738 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb index 9e4b7485..101f5905 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVcNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb index a83b64d4..42e9082d 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb index f1c3e12b..827710f5 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc index cf49705a..a9922b7c 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.inc @@ -92,10 +92,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTx[] = { - 68, 88, 66, 67, 221, 31, - 142, 229, 169, 36, 224, 144, - 197, 201, 122, 92, 5, 203, - 71, 87, 1, 0, 0, 0, + 68, 88, 66, 67, 29, 223, + 66, 132, 172, 60, 26, 6, + 0, 131, 133, 52, 192, 8, + 78, 86, 1, 0, 0, 0, 208, 8, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 48, 1, @@ -454,9 +454,9 @@ const BYTE BasicEffect_VSBasicVertexLightingTx[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb index 2d4120cf..325b7b92 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc index 650b20d7..3d157b25 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.inc @@ -93,10 +93,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = { - 68, 88, 66, 67, 188, 10, - 22, 174, 171, 39, 222, 45, - 134, 91, 13, 129, 96, 234, - 51, 246, 1, 0, 0, 0, + 68, 88, 66, 67, 158, 159, + 92, 140, 7, 235, 20, 215, + 101, 93, 48, 147, 95, 79, + 146, 250, 1, 0, 0, 0, 12, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 48, 1, @@ -465,9 +465,9 @@ const BYTE BasicEffect_VSBasicVertexLightingTxBn[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 0, + 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb index ebdef128..b303272d 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc index add2b3c6..ad3b4fef 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.inc @@ -95,10 +95,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = { - 68, 88, 66, 67, 157, 199, - 181, 40, 223, 116, 115, 213, - 249, 116, 8, 207, 109, 130, - 220, 99, 1, 0, 0, 0, + 68, 88, 66, 67, 210, 224, + 41, 236, 20, 148, 166, 205, + 47, 175, 61, 117, 138, 68, + 149, 87, 1, 0, 0, 0, 32, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 80, 1, @@ -470,9 +470,9 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVc[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb index 8a0380c4..71646ac9 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc index 5af581b1..0b74aeea 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.inc @@ -96,10 +96,10 @@ ret const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = { - 68, 88, 66, 67, 123, 9, - 112, 144, 136, 51, 154, 22, - 190, 220, 86, 107, 3, 7, - 239, 38, 1, 0, 0, 0, + 68, 88, 66, 67, 130, 39, + 110, 35, 130, 121, 102, 35, + 247, 67, 24, 153, 229, 154, + 143, 15, 1, 0, 0, 0, 92, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 80, 1, @@ -481,9 +481,9 @@ const BYTE BasicEffect_VSBasicVertexLightingTxVcBn[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb index abeca4a0..69176dde 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb index 954b201c..0d677845 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb index 3be14596..9fb7237e 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/BasicEffect_VSBasicVertexLightingVcBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc index 8a6714f1..8f692d35 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.inc @@ -46,10 +46,10 @@ ret const BYTE DualTextureEffect_PSDualTexture[] = { - 68, 88, 66, 67, 120, 96, - 20, 233, 179, 62, 244, 132, - 229, 168, 132, 16, 176, 175, - 196, 22, 1, 0, 0, 0, + 68, 88, 66, 67, 64, 156, + 48, 206, 58, 28, 162, 255, + 79, 149, 241, 252, 4, 179, + 170, 163, 1, 0, 0, 0, 120, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -164,13 +164,13 @@ const BYTE DualTextureEffect_PSDualTexture[] = 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb index bd200b75..4f0a1fa3 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTexture.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc index 4ec93af3..f2577048 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.inc @@ -40,10 +40,10 @@ ret const BYTE DualTextureEffect_PSDualTextureNoFog[] = { - 68, 88, 66, 67, 145, 207, - 33, 23, 139, 137, 116, 35, - 60, 176, 96, 115, 205, 111, - 95, 150, 1, 0, 0, 0, + 68, 88, 66, 67, 76, 100, + 153, 24, 127, 7, 2, 241, + 143, 227, 113, 152, 153, 213, + 5, 228, 1, 0, 0, 0, 224, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -133,13 +133,13 @@ const BYTE DualTextureEffect_PSDualTextureNoFog[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb index 92040a5b..0118df77 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_PSDualTextureNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc index 93c331b7..5ef1f334 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.inc @@ -48,10 +48,10 @@ ret const BYTE DualTextureEffect_VSDualTexture[] = { - 68, 88, 66, 67, 53, 143, - 95, 144, 58, 24, 210, 93, - 130, 254, 61, 134, 84, 75, - 135, 242, 1, 0, 0, 0, + 68, 88, 66, 67, 133, 118, + 230, 45, 223, 73, 47, 213, + 178, 206, 149, 171, 236, 221, + 155, 241, 1, 0, 0, 0, 164, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 160, 0, 0, 0, 68, 1, @@ -174,13 +174,13 @@ const BYTE DualTextureEffect_VSDualTexture[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb index c54020c8..83980ea2 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTexture.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc index 6843bf23..d596ced5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.inc @@ -44,10 +44,10 @@ ret const BYTE DualTextureEffect_VSDualTextureNoFog[] = { - 68, 88, 66, 67, 101, 115, - 146, 6, 83, 107, 69, 123, - 121, 120, 89, 250, 160, 80, - 77, 163, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 62, + 189, 70, 56, 38, 36, 121, + 82, 216, 139, 80, 227, 0, + 236, 147, 1, 0, 0, 0, 64, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 160, 0, 0, 0, 44, 1, @@ -153,13 +153,13 @@ const BYTE DualTextureEffect_VSDualTextureNoFog[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb index f1d025af..1a324a07 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc index e4e54b51..a95bdfa6 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.inc @@ -50,10 +50,10 @@ ret const BYTE DualTextureEffect_VSDualTextureVc[] = { - 68, 88, 66, 67, 14, 234, - 113, 19, 154, 234, 128, 16, - 85, 180, 224, 49, 22, 20, - 47, 2, 1, 0, 0, 0, + 68, 88, 66, 67, 13, 159, + 251, 103, 234, 214, 139, 95, + 254, 245, 98, 166, 249, 31, + 182, 225, 1, 0, 0, 0, 212, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 188, 0, 0, 0, 96, 1, @@ -184,13 +184,13 @@ const BYTE DualTextureEffect_VSDualTextureVc[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb index 6533c490..50d59b07 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc index 7331cfac..e97fc41b 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.inc @@ -46,10 +46,10 @@ ret const BYTE DualTextureEffect_VSDualTextureVcNoFog[] = { - 68, 88, 66, 67, 214, 171, - 146, 102, 39, 75, 81, 112, - 212, 133, 130, 101, 222, 230, - 158, 127, 1, 0, 0, 0, + 68, 88, 66, 67, 85, 38, + 234, 73, 152, 176, 84, 200, + 221, 169, 237, 70, 94, 240, + 94, 140, 1, 0, 0, 0, 112, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 188, 0, 0, 0, 72, 1, @@ -163,13 +163,13 @@ const BYTE DualTextureEffect_VSDualTextureVcNoFog[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb index f4ac4408..eaa7ab5b 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/DualTextureEffect_VSDualTextureVcNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc index 65ea0dcc..0516a777 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.inc @@ -46,10 +46,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMap[] = { - 68, 88, 66, 67, 145, 211, - 131, 252, 192, 169, 109, 166, - 216, 80, 89, 0, 223, 162, - 224, 168, 1, 0, 0, 0, + 68, 88, 66, 67, 11, 232, + 187, 48, 137, 31, 100, 18, + 210, 46, 26, 244, 167, 108, + 201, 249, 1, 0, 0, 0, 128, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -166,13 +166,13 @@ const BYTE EnvironmentMapEffect_PSEnvMap[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb index a63ed114..31c0e847 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMap.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc index a625babf..67123215 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.inc @@ -43,10 +43,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapNoFog[] = { - 68, 88, 66, 67, 98, 165, - 66, 188, 15, 196, 86, 250, - 118, 40, 33, 197, 66, 91, - 122, 184, 1, 0, 0, 0, + 68, 88, 66, 67, 148, 180, + 223, 172, 1, 56, 255, 84, + 190, 186, 4, 215, 156, 94, + 15, 122, 1, 0, 0, 0, 32, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -147,13 +147,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapNoFog[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb index 452d69f0..0dc4de90 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc index 16d716f6..1dde46f4 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.inc @@ -69,10 +69,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = { - 68, 88, 66, 67, 245, 235, - 136, 148, 61, 15, 89, 11, - 160, 132, 27, 65, 211, 44, - 51, 211, 1, 0, 0, 0, + 68, 88, 66, 67, 115, 121, + 162, 19, 3, 206, 107, 246, + 253, 106, 40, 248, 24, 183, + 47, 7, 1, 0, 0, 0, 124, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -316,13 +316,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLighting[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb index 17d4027b..49471377 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc index a93cd895..1619eba5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc @@ -76,10 +76,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = { - 68, 88, 66, 67, 222, 104, - 10, 237, 124, 211, 84, 184, - 42, 8, 109, 152, 34, 211, - 138, 85, 1, 0, 0, 0, + 68, 88, 66, 67, 253, 176, + 155, 10, 12, 229, 153, 23, + 196, 48, 58, 164, 230, 218, + 150, 9, 1, 0, 0, 0, 56, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -354,13 +354,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnel[] = 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb index 8da8c614..714479f0 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc index 4a60c65b..8c4e84d5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc @@ -74,10 +74,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog[] = { - 68, 88, 66, 67, 65, 128, - 38, 206, 224, 95, 209, 229, - 254, 229, 23, 148, 28, 105, - 144, 86, 1, 0, 0, 0, + 68, 88, 66, 67, 37, 12, + 37, 30, 60, 222, 32, 112, + 109, 110, 104, 172, 11, 31, + 124, 27, 1, 0, 0, 0, 232, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -339,13 +339,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb index 1e4f2b92..3e18fc96 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc index a7ae98a6..9b32952e 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc @@ -67,10 +67,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingNoFog[] = { - 68, 88, 66, 67, 186, 188, - 209, 197, 242, 184, 166, 16, - 46, 36, 216, 115, 246, 61, - 168, 219, 1, 0, 0, 0, + 68, 88, 66, 67, 208, 66, + 96, 136, 216, 88, 239, 102, + 130, 19, 82, 14, 215, 110, + 198, 220, 1, 0, 0, 0, 44, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -301,13 +301,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapPixelLightingNoFog[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb index 0940f704..1ec72d7c 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc index baf9fbc2..ca419661 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.inc @@ -48,10 +48,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapSpecular[] = { - 68, 88, 66, 67, 50, 49, - 40, 249, 123, 117, 150, 132, - 131, 58, 77, 66, 94, 252, - 251, 30, 1, 0, 0, 0, + 68, 88, 66, 67, 177, 26, + 203, 231, 219, 61, 130, 129, + 171, 54, 39, 53, 95, 6, + 150, 217, 1, 0, 0, 0, 196, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -179,13 +179,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapSpecular[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb index adc7fb24..ac70b8dc 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecular.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc index da139e9a..4f6cd0fb 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc @@ -46,10 +46,10 @@ ret const BYTE EnvironmentMapEffect_PSEnvMapSpecularNoFog[] = { - 68, 88, 66, 67, 186, 51, - 132, 152, 181, 67, 188, 75, - 192, 100, 13, 249, 186, 173, - 173, 126, 1, 0, 0, 0, + 68, 88, 66, 67, 178, 102, + 16, 118, 33, 133, 34, 14, + 230, 38, 102, 115, 150, 111, + 158, 38, 1, 0, 0, 0, 116, 3, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -164,13 +164,13 @@ const BYTE EnvironmentMapEffect_PSEnvMapSpecularNoFog[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb index 78bb1a91..59631591 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc index 369d1980..405b2b0a 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.inc @@ -74,10 +74,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMap[] = { - 68, 88, 66, 67, 164, 37, - 184, 22, 241, 82, 104, 56, - 49, 180, 146, 94, 217, 244, - 133, 5, 1, 0, 0, 0, + 68, 88, 66, 67, 101, 89, + 36, 238, 205, 101, 94, 74, + 81, 221, 180, 17, 147, 117, + 71, 196, 1, 0, 0, 0, 236, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -340,13 +340,13 @@ const BYTE EnvironmentMapEffect_VSEnvMap[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb index f6b671cb..dbbb3a1d 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMap.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc index 880d71be..5ae1f9dd 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.inc @@ -75,10 +75,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapBn[] = { - 68, 88, 66, 67, 0, 122, - 185, 40, 167, 186, 46, 188, - 170, 200, 236, 197, 63, 193, - 243, 25, 1, 0, 0, 0, + 68, 88, 66, 67, 95, 234, + 247, 131, 108, 109, 43, 145, + 114, 193, 86, 116, 69, 15, + 229, 0, 1, 0, 0, 0, 40, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -351,13 +351,13 @@ const BYTE EnvironmentMapEffect_VSEnvMapBn[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb index 207cec2f..04396a66 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc index 03cdbef8..e82aa266 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.inc @@ -80,10 +80,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = { - 68, 88, 66, 67, 30, 158, - 166, 187, 164, 139, 7, 132, - 182, 207, 57, 194, 208, 93, - 148, 253, 1, 0, 0, 0, + 68, 88, 66, 67, 192, 0, + 63, 132, 71, 148, 232, 214, + 169, 141, 245, 16, 151, 212, + 216, 255, 1, 0, 0, 0, 148, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -374,13 +374,13 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnel[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb index 95d19054..f2fdf580 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnel.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc index a1ef64e1..aa524e9d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.inc @@ -81,10 +81,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = { - 68, 88, 66, 67, 94, 45, - 195, 35, 242, 254, 111, 182, - 225, 224, 98, 229, 11, 18, - 185, 236, 1, 0, 0, 0, + 68, 88, 66, 67, 156, 140, + 49, 136, 52, 66, 204, 120, + 177, 235, 34, 45, 44, 152, + 10, 155, 1, 0, 0, 0, 208, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -385,13 +385,13 @@ const BYTE EnvironmentMapEffect_VSEnvMapFresnelBn[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 168, 0, + 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb index dbfe342f..c223c5d1 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapFresnelBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc index c5290d7c..8e378988 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.inc @@ -57,10 +57,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = { - 68, 88, 66, 67, 202, 107, - 35, 131, 62, 191, 172, 187, - 115, 195, 12, 198, 99, 137, - 248, 213, 1, 0, 0, 0, + 68, 88, 66, 67, 238, 122, + 104, 157, 227, 92, 171, 193, + 93, 75, 224, 11, 55, 58, + 198, 11, 1, 0, 0, 0, 168, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -226,13 +226,13 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLighting[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb index fd77f235..d878ca9b 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc index 4cecddfe..9547e998 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc @@ -58,10 +58,10 @@ ret const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = { - 68, 88, 66, 67, 187, 8, - 110, 161, 160, 230, 220, 54, - 91, 121, 149, 220, 70, 48, - 161, 254, 1, 0, 0, 0, + 68, 88, 66, 67, 36, 27, + 73, 226, 252, 8, 54, 248, + 157, 139, 44, 177, 200, 197, + 89, 226, 1, 0, 0, 0, 228, 4, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 72, 1, @@ -237,13 +237,13 @@ const BYTE EnvironmentMapEffect_VSEnvMapPixelLightingBn[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 168, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb index 439cc1db..fd7f18c1 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/GenerateMips_main.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/GenerateMips_main.pdb index 9639d11b..1c22cb73 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/GenerateMips_main.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/GenerateMips_main.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc index 1abca1cf..cafec44c 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.inc @@ -100,10 +100,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = { - 68, 88, 66, 67, 211, 236, - 91, 207, 166, 154, 175, 89, - 247, 138, 106, 38, 150, 232, - 169, 173, 1, 0, 0, 0, + 68, 88, 66, 67, 110, 193, + 188, 167, 241, 17, 156, 59, + 15, 61, 241, 19, 248, 122, + 141, 152, 1, 0, 0, 0, 28, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 0, 0, 0, 252, 0, @@ -502,15 +502,15 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTx[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 176, 0, + 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb index 6f173a99..44747148 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc index 8c7e500f..339c35f8 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.inc @@ -98,10 +98,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = { - 68, 88, 66, 67, 42, 169, - 244, 57, 144, 69, 29, 18, - 186, 46, 253, 17, 81, 255, - 230, 210, 1, 0, 0, 0, + 68, 88, 66, 67, 214, 158, + 109, 118, 182, 58, 110, 214, + 11, 81, 110, 77, 169, 240, + 3, 20, 1, 0, 0, 0, 204, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 0, 0, 0, 252, 0, @@ -486,15 +486,15 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFog[] = 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb index 6d6c11f7..d7283466 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc index 44a74fe4..a341cff7 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc @@ -95,10 +95,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = { - 68, 88, 66, 67, 235, 56, - 174, 67, 223, 146, 195, 29, - 122, 155, 213, 89, 180, 160, - 46, 17, 1, 0, 0, 0, + 68, 88, 66, 67, 101, 85, + 220, 77, 183, 207, 248, 144, + 200, 89, 144, 232, 43, 45, + 82, 26, 1, 0, 0, 0, 76, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 0, 0, 0, 252, 0, @@ -469,11 +469,11 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoFogSpec[] = 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 72, 0, + 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 100, 0, + 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 128, 0, + 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb index 39f3b64b..b4aec2cd 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc index 283b321b..548e916c 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc @@ -97,10 +97,10 @@ ret const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = { - 68, 88, 66, 67, 121, 116, - 186, 89, 234, 243, 112, 23, - 156, 158, 87, 3, 9, 208, - 64, 3, 1, 0, 0, 0, + 68, 88, 66, 67, 154, 180, + 130, 249, 80, 71, 46, 78, + 105, 182, 107, 200, 129, 185, + 135, 221, 1, 0, 0, 0, 156, 9, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 200, 0, 0, 0, 252, 0, @@ -484,11 +484,11 @@ const BYTE NormalMapEffect_PSNormalPixelLightingTxNoSpec[] = 24, 0, 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb index aeeeacc0..714450da 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc index e207d413..3713c895 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.inc @@ -67,10 +67,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = { - 68, 88, 66, 67, 15, 29, - 214, 5, 217, 154, 216, 97, - 111, 52, 221, 101, 26, 4, - 131, 226, 1, 0, 0, 0, + 68, 88, 66, 67, 108, 194, + 137, 121, 68, 194, 145, 19, + 162, 64, 204, 13, 124, 103, + 109, 215, 1, 0, 0, 0, 164, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 128, 1, @@ -278,15 +278,15 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTx[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb index 6ca8f2be..94fd9f32 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTx.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc index 6245b283..879e8f63 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.inc @@ -69,10 +69,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = { - 68, 88, 66, 67, 63, 209, - 30, 208, 1, 192, 56, 19, - 77, 33, 202, 129, 96, 98, - 246, 194, 1, 0, 0, 0, + 68, 88, 66, 67, 85, 105, + 19, 189, 78, 228, 235, 47, + 87, 35, 191, 102, 94, 152, + 31, 227, 1, 0, 0, 0, 28, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 128, 1, @@ -300,15 +300,15 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxBn[] = 24, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb index 5cf9474f..2d6a0abf 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.inc index e97b2c64..5a1fe0c5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.inc @@ -67,10 +67,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxNoSpec[] = { - 68, 88, 66, 67, 127, 8, - 186, 142, 88, 23, 198, 112, - 23, 189, 26, 52, 251, 251, - 84, 147, 1, 0, 0, 0, + 68, 88, 66, 67, 50, 211, + 65, 21, 57, 124, 158, 225, + 129, 109, 233, 228, 8, 16, + 248, 187, 1, 0, 0, 0, 124, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 128, 1, @@ -278,11 +278,11 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxNoSpec[] = 24, 0, 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.pdb index 3234cf82..f159d246 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpec.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.inc index e8dd1c1c..857f8058 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.inc @@ -69,10 +69,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxNoSpecBn[] = { - 68, 88, 66, 67, 229, 113, - 7, 109, 169, 39, 255, 121, - 159, 22, 233, 99, 176, 4, - 110, 194, 1, 0, 0, 0, + 68, 88, 66, 67, 103, 208, + 166, 93, 118, 105, 133, 45, + 158, 239, 209, 159, 208, 139, + 115, 6, 1, 0, 0, 0, 244, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 196, 0, 0, 0, 128, 1, @@ -300,11 +300,11 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxNoSpecBn[] = 24, 0, 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.pdb index 7538bf9e..dc7a18f4 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc index 68f7d69a..1dfd9e0e 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.inc @@ -69,10 +69,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = { - 68, 88, 66, 67, 230, 59, - 169, 64, 246, 100, 253, 22, - 164, 108, 55, 81, 166, 120, - 32, 238, 1, 0, 0, 0, + 68, 88, 66, 67, 177, 34, + 191, 246, 76, 17, 51, 78, + 121, 232, 25, 32, 74, 176, + 111, 131, 1, 0, 0, 0, 204, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 228, 0, 0, 0, 160, 1, @@ -287,15 +287,15 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVc[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 176, 0, + 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb index b01c82eb..41dbe35e 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVc.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc index 8ef48f91..f6c376de 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.inc @@ -71,10 +71,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = { - 68, 88, 66, 67, 102, 232, - 199, 236, 21, 41, 245, 50, - 68, 123, 60, 34, 177, 81, - 88, 211, 1, 0, 0, 0, + 68, 88, 66, 67, 210, 64, + 198, 147, 222, 231, 61, 60, + 164, 205, 154, 190, 51, 227, + 20, 193, 1, 0, 0, 0, 68, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 228, 0, 0, 0, 160, 1, @@ -309,15 +309,15 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcBn[] = 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, + 5, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, + 5, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 140, 0, + 5, 0, 0, 0, 140, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 176, 0, + 5, 0, 0, 0, 176, 0, 0, 0, 1, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb index 2e1d8542..e0dad4fa 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.inc index 39ae88ce..b5776b23 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.inc @@ -69,10 +69,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVcNoSpec[] = { - 68, 88, 66, 67, 51, 91, - 175, 202, 32, 190, 43, 126, - 181, 219, 41, 248, 80, 132, - 233, 140, 1, 0, 0, 0, + 68, 88, 66, 67, 220, 253, + 154, 42, 190, 173, 137, 170, + 79, 179, 59, 101, 252, 120, + 187, 114, 1, 0, 0, 0, 164, 5, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 228, 0, 0, 0, 160, 1, @@ -287,11 +287,11 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcNoSpec[] = 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 72, 0, + 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 100, 0, + 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 128, 0, + 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.pdb index b6a1aded..93383452 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.inc index 04321f07..9bc923e4 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.inc @@ -71,10 +71,10 @@ ret const BYTE NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn[] = { - 68, 88, 66, 67, 190, 198, - 247, 198, 136, 193, 219, 215, - 136, 47, 7, 41, 9, 177, - 68, 237, 1, 0, 0, 0, + 68, 88, 66, 67, 14, 28, + 36, 255, 123, 96, 197, 100, + 129, 87, 128, 15, 242, 240, + 170, 154, 1, 0, 0, 0, 28, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 228, 0, 0, 0, 160, 1, @@ -309,11 +309,11 @@ const BYTE NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn[] = 0, 0, 0, 0, 0, 0, 164, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 72, 0, + 5, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 100, 0, + 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 128, 0, + 5, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 156, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.pdb index ff86c7a6..c73f24d0 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc new file mode 100644 index 00000000..0c2043a3 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.inc @@ -0,0 +1,163 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[32], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(15) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample_indexable(texture2d)(float,float,float,float) r2.xyzw, r1.yzyy, t0.xyzw, s0 + mad r0.xyzw, cb0[r1.x + 16].xyzw, r2.xyzw, r0.xyzw + iadd r1.x, r1.x, l(1) +endloop +mov o0.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomBlur[] = +{ + 68, 88, 66, 67, 203, 243, + 207, 94, 93, 58, 165, 216, + 37, 179, 231, 137, 172, 100, + 194, 123, 1, 0, 0, 0, + 196, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 1, 0, 0, 80, 0, + 0, 0, 92, 0, 0, 0, + 106, 8, 0, 1, 89, 8, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 32, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 54, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 18, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 0, + 48, 0, 0, 1, 33, 0, + 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 15, 0, + 0, 0, 3, 0, 4, 3, + 26, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 9, + 98, 0, 16, 0, 1, 0, + 0, 0, 6, 17, 16, 0, + 1, 0, 0, 0, 6, 129, + 32, 4, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 2, 0, 0, 0, 150, 5, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 50, 0, + 0, 12, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 142, + 32, 6, 0, 0, 0, 0, + 16, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 70, 14, 16, 0, 2, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 22, 0, 0, 1, + 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb new file mode 100644 index 00000000..63f8af0d Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomBlur.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc new file mode 100644 index 00000000..178f012a --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.inc @@ -0,0 +1,209 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[19], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 r1.x, r0.xyzx, l(0.212500, 0.715400, 0.072100, 0.000000) +add r0.xyzw, r0.xyzw, -r1.xxxx +mad r0.xyzw, cb0[16].xxxx, r0.xyzw, r1.xxxx +mul r0.xyzw, r0.xyzw, cb0[17].xyzw +sample_indexable(texture2d)(float,float,float,float) r1.xyzw, v1.xyxx, t1.xyzw, s0 +dp3 r2.x, r1.xyzx, l(0.212500, 0.715400, 0.072100, 0.000000) +add r1.xyzw, r1.xyzw, -r2.xxxx +mad r1.xyzw, cb0[16].yyyy, r1.xyzw, r2.xxxx +mul r1.xyzw, r1.xyzw, cb0[18].xyzw +mov_sat r2.xyzw, r1.xyzw +add r2.xyzw, -r2.xyzw, l(1.000000, 1.000000, 1.000000, 1.000000) +mad o0.xyzw, r0.xyzw, r2.xyzw, r1.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomCombine[] = +{ + 68, 88, 66, 67, 177, 212, + 87, 157, 93, 200, 197, 180, + 82, 141, 30, 117, 230, 217, + 207, 67, 1, 0, 0, 0, + 196, 3, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 12, 3, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 72, 2, 0, 0, 80, 0, + 0, 0, 146, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 19, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 1, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 3, 0, 0, 0, + 69, 0, 0, 139, 194, 0, + 0, 128, 67, 85, 21, 0, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, + 16, 0, 0, 0, 0, 0, + 0, 96, 16, 0, 0, 0, + 0, 0, 16, 0, 0, 10, + 18, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 154, 153, 89, 62, + 116, 36, 55, 63, 42, 169, + 147, 61, 0, 0, 0, 0, + 0, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 6, 0, 16, 128, + 65, 0, 0, 0, 1, 0, + 0, 0, 50, 0, 0, 10, + 242, 0, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 6, 0, + 16, 0, 1, 0, 0, 0, + 56, 0, 0, 8, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 1, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 18, 0, 16, 0, + 2, 0, 0, 0, 70, 2, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 154, 153, + 89, 62, 116, 36, 55, 63, + 42, 169, 147, 61, 0, 0, + 0, 0, 0, 0, 0, 8, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 6, 0, + 16, 128, 65, 0, 0, 0, + 2, 0, 0, 0, 50, 0, + 0, 10, 242, 0, 16, 0, + 1, 0, 0, 0, 86, 133, + 32, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 70, 14, + 16, 0, 1, 0, 0, 0, + 6, 0, 16, 0, 2, 0, + 0, 0, 56, 0, 0, 8, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, + 18, 0, 0, 0, 54, 32, + 0, 5, 242, 0, 16, 0, + 2, 0, 0, 0, 70, 14, + 16, 0, 1, 0, 0, 0, + 0, 0, 0, 11, 242, 0, + 16, 0, 2, 0, 0, 0, + 70, 14, 16, 128, 65, 0, + 0, 0, 2, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 50, 0, 0, 9, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 176, 0, + 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 124, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 60, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 88, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 116, 0, + 0, 0, 1, 0, 0, 0, + 68, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 96, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 255, 255, 0, 0, + 0, 0, 0, 0, 0, 0, + 21, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 4, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 127, 127, 0, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb new file mode 100644 index 00000000..51dbafe0 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomCombine.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc new file mode 100644 index 00000000..81024f49 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.inc @@ -0,0 +1,136 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[17], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +add r0.xyzw, r0.xyzw, -cb0[16].xyzw +add r1.xyzw, -cb0[16].xyzw, l(1.000000, 1.000000, 1.000000, 1.000000) +div_sat o0.xyzw, r0.xyzw, r1.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSBloomExtract[] = +{ + 68, 88, 66, 67, 218, 146, + 198, 203, 230, 238, 109, 127, + 195, 109, 87, 39, 234, 222, + 156, 140, 1, 0, 0, 0, + 76, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 188, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 248, 0, 0, 0, 80, 0, + 0, 0, 62, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 2, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 0, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 128, 65, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, + 0, 12, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 142, + 32, 128, 65, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 128, 63, 14, 32, + 0, 7, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb new file mode 100644 index 00000000..1e5a0a08 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSBloomExtract.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.inc new file mode 100644 index 00000000..35073789 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.inc @@ -0,0 +1,105 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +sample_indexable(texture2d)(float,float,float,float) o0.xyzw, v1.xyxx, t0.xyzw, s0 +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSCopy[] = +{ + 68, 88, 66, 67, 76, 165, + 2, 173, 54, 220, 89, 15, + 91, 89, 113, 100, 12, 130, + 206, 227, 1, 0, 0, 0, + 176, 1, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 0, 0, 0, 80, 0, + 0, 0, 28, 0, 0, 0, + 106, 8, 0, 1, 90, 0, + 0, 3, 0, 96, 16, 0, + 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 116, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 64, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 36, 0, 0, 0, 1, 0, + 0, 0, 44, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.pdb new file mode 100644 index 00000000..9ac97b3e Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSCopy.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc new file mode 100644 index 00000000..a7473310 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.inc @@ -0,0 +1,163 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[5], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(4) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample_indexable(texture2d)(float,float,float,float) r2.xyzw, r1.yzyy, t0.xyzw, s0 + add r0.xyzw, r0.xyzw, r2.xyzw + iadd r1.x, r1.x, l(1) +endloop +mul o0.xyzw, r0.xyzw, l(0.250000, 0.250000, 0.250000, 0.250000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSDownScale2x2[] = +{ + 68, 88, 66, 67, 211, 16, + 171, 33, 207, 55, 14, 211, + 85, 220, 1, 174, 137, 66, + 232, 182, 1, 0, 0, 0, + 196, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 1, 0, 0, 80, 0, + 0, 0, 92, 0, 0, 0, + 106, 8, 0, 1, 89, 8, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 5, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 54, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 18, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 0, + 48, 0, 0, 1, 33, 0, + 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 4, 0, + 0, 0, 3, 0, 4, 3, + 26, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 9, + 98, 0, 16, 0, 1, 0, + 0, 0, 6, 17, 16, 0, + 1, 0, 0, 0, 6, 129, + 32, 4, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 2, 0, 0, 0, 150, 5, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 0, 0, + 0, 7, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 2, 0, + 0, 0, 30, 0, 0, 7, + 18, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 22, 0, 0, 1, 56, 0, + 0, 10, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 128, 62, 0, 0, 128, 62, + 0, 0, 128, 62, 0, 0, + 128, 62, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb new file mode 100644 index 00000000..4166f7b2 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale2x2.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc new file mode 100644 index 00000000..f0a7f0a6 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.inc @@ -0,0 +1,163 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[16], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(16) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample_indexable(texture2d)(float,float,float,float) r2.xyzw, r1.yzyy, t0.xyzw, s0 + add r0.xyzw, r0.xyzw, r2.xyzw + iadd r1.x, r1.x, l(1) +endloop +mul o0.xyzw, r0.xyzw, l(0.062500, 0.062500, 0.062500, 0.062500) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSDownScale4x4[] = +{ + 68, 88, 66, 67, 24, 243, + 142, 24, 67, 28, 9, 178, + 0, 171, 224, 178, 145, 154, + 211, 52, 1, 0, 0, 0, + 196, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 1, 0, 0, 80, 0, + 0, 0, 92, 0, 0, 0, + 106, 8, 0, 1, 89, 8, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 54, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 18, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 0, + 48, 0, 0, 1, 33, 0, + 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 16, 0, + 0, 0, 3, 0, 4, 3, + 26, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 9, + 98, 0, 16, 0, 1, 0, + 0, 0, 6, 17, 16, 0, + 1, 0, 0, 0, 6, 129, + 32, 4, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 2, 0, 0, 0, 150, 5, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 0, 0, + 0, 7, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 2, 0, + 0, 0, 30, 0, 0, 7, + 18, 0, 16, 0, 1, 0, + 0, 0, 10, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 22, 0, 0, 1, 56, 0, + 0, 10, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 128, 61, 0, 0, 128, 61, + 0, 0, 128, 61, 0, 0, + 128, 61, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb new file mode 100644 index 00000000..4007923f Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSDownScale4x4.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc new file mode 100644 index 00000000..6f53e6af --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.inc @@ -0,0 +1,163 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[30], dynamicIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +mov r0.xyzw, l(0,0,0,0) +mov r1.x, l(0) +loop + ige r1.y, r1.x, l(13) + breakc_nz r1.y + add r1.yz, v1.xxyx, cb0[r1.x + 0].xxyx + sample_indexable(texture2d)(float,float,float,float) r2.xyzw, r1.yzyy, t0.xyzw, s0 + mad r0.xyzw, cb0[r1.x + 16].xyzw, r2.xyzw, r0.xyzw + iadd r1.x, r1.x, l(1) +endloop +mov o0.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSGaussianBlur5x5[] = +{ + 68, 88, 66, 67, 189, 144, + 221, 91, 127, 30, 145, 24, + 188, 31, 97, 189, 59, 221, + 47, 235, 1, 0, 0, 0, + 196, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 1, 0, 0, 80, 0, + 0, 0, 92, 0, 0, 0, + 106, 8, 0, 1, 89, 8, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 30, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 54, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 18, 0, 16, 0, + 1, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 0, + 48, 0, 0, 1, 33, 0, + 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 13, 0, + 0, 0, 3, 0, 4, 3, + 26, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 9, + 98, 0, 16, 0, 1, 0, + 0, 0, 6, 17, 16, 0, + 1, 0, 0, 0, 6, 129, + 32, 4, 0, 0, 0, 0, + 10, 0, 16, 0, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 2, 0, 0, 0, 150, 5, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 50, 0, + 0, 12, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 142, + 32, 6, 0, 0, 0, 0, + 16, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 70, 14, 16, 0, 2, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 10, 0, + 16, 0, 1, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 22, 0, 0, 1, + 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb new file mode 100644 index 00000000..96e5686b Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSGaussianBlur5x5.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.inc new file mode 100644 index 00000000..149b7d1c --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.inc @@ -0,0 +1,147 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[18], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_resource_texture2d (float,float,float,float) t1 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t1.xyzw, s0 +mul r0.xyzw, r0.xyzw, cb0[17].xyzw +sample_indexable(texture2d)(float,float,float,float) r1.xyzw, v1.xyxx, t0.xyzw, s0 +mad o0.xyzw, cb0[16].xyzw, r1.xyzw, r0.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSMerge[] = +{ + 68, 88, 66, 67, 115, 190, + 111, 151, 155, 4, 237, 169, + 178, 209, 44, 153, 126, 14, + 254, 98, 1, 0, 0, 0, + 136, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 208, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 12, 1, 0, 0, 80, 0, + 0, 0, 67, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 18, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 88, 24, 0, 4, 0, 112, + 16, 0, 1, 0, 0, 0, + 85, 85, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, + 69, 0, 0, 139, 194, 0, + 0, 128, 67, 85, 21, 0, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, + 16, 0, 1, 0, 0, 0, + 0, 96, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 8, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, + 17, 0, 0, 0, 69, 0, + 0, 139, 194, 0, 0, 128, + 67, 85, 21, 0, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 50, 0, 0, 10, 242, 32, + 16, 0, 0, 0, 0, 0, + 70, 142, 32, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 176, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 124, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 60, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 88, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 116, 0, 0, 0, 1, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 1, 0, 0, 0, + 96, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.pdb new file mode 100644 index 00000000..38426fb0 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMerge.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc new file mode 100644 index 00000000..569c5710 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.inc @@ -0,0 +1,120 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xwyz, s0 +dp3 r0.x, r0.xzwx, l(0.212500, 0.715400, 0.072100, 0.000000) +mov o0.xyzw, r0.xxxy +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSMonochrome[] = +{ + 68, 88, 66, 67, 184, 139, + 64, 163, 129, 210, 109, 254, + 137, 129, 227, 4, 121, 94, + 76, 185, 1, 0, 0, 0, + 244, 1, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 120, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 180, 0, 0, 0, 80, 0, + 0, 0, 45, 0, 0, 0, + 106, 8, 0, 1, 90, 0, + 0, 3, 0, 96, 16, 0, + 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 69, 0, + 0, 139, 194, 0, 0, 128, + 67, 85, 21, 0, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 198, 121, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 16, 0, 0, 10, 18, 0, + 16, 0, 0, 0, 0, 0, + 134, 3, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 154, 153, 89, 62, 116, 36, + 55, 63, 42, 169, 147, 61, + 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, + 0, 0, 0, 0, 6, 4, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1, 82, 84, + 83, 48, 116, 0, 0, 0, + 1, 0, 0, 0, 1, 0, + 0, 0, 24, 0, 0, 0, + 1, 0, 0, 0, 64, 0, + 0, 0, 30, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0, 36, 0, 0, 0, + 1, 0, 0, 0, 44, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 255, 255, 21, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb new file mode 100644 index 00000000..4f35b3da Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSMonochrome.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.inc new file mode 100644 index 00000000..9be2483b --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.inc @@ -0,0 +1,135 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 o0.x, r0.xyzx, l(0.393000, 0.769000, 0.189000, 0.000000) +dp3 o0.y, r0.xyzx, l(0.349000, 0.686000, 0.168000, 0.000000) +dp3 o0.z, r0.xyzx, l(0.272000, 0.534000, 0.131000, 0.000000) +mov o0.w, r0.w +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_PSSepia[] = +{ + 68, 88, 66, 67, 4, 102, + 118, 120, 192, 215, 167, 93, + 141, 153, 231, 252, 228, 163, + 166, 87, 1, 0, 0, 0, + 68, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 200, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 4, 1, 0, 0, 80, 0, + 0, 0, 65, 0, 0, 0, + 106, 8, 0, 1, 90, 0, + 0, 3, 0, 96, 16, 0, + 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 69, 0, + 0, 139, 194, 0, 0, 128, + 67, 85, 21, 0, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 16, 0, 0, 10, 18, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 76, 55, 201, 62, 47, 221, + 68, 63, 55, 137, 65, 62, + 0, 0, 0, 0, 16, 0, + 0, 10, 34, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 33, 176, + 178, 62, 178, 157, 47, 63, + 49, 8, 44, 62, 0, 0, + 0, 0, 16, 0, 0, 10, + 66, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 150, 67, 139, 62, + 57, 180, 8, 63, 221, 36, + 6, 62, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 116, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 64, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 36, 0, + 0, 0, 1, 0, 0, 0, + 44, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 21, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 4, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 127, 127, 0, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.pdb new file mode 100644 index 00000000..6972e957 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_PSSepia.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.inc new file mode 100644 index 00000000..fba1038d --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.inc @@ -0,0 +1,146 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_5_0 +dcl_globalFlags refactoringAllowed +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_VSQuad[] = +{ + 68, 88, 66, 67, 119, 55, + 65, 45, 148, 194, 70, 116, + 59, 74, 184, 251, 188, 60, + 254, 173, 1, 0, 0, 0, + 120, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 100, 0, 0, 0, 188, 0, + 0, 0, 232, 1, 0, 0, + 73, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 1, 1, 0, 0, 83, 86, + 95, 86, 101, 114, 116, 101, + 120, 73, 100, 0, 79, 83, + 71, 78, 80, 0, 0, 0, + 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 12, + 0, 0, 83, 86, 95, 80, + 111, 115, 105, 116, 105, 111, + 110, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, + 171, 171, 83, 72, 69, 88, + 36, 1, 0, 0, 80, 0, + 1, 0, 73, 0, 0, 0, + 106, 8, 0, 1, 96, 0, + 0, 4, 18, 16, 16, 0, + 0, 0, 0, 0, 6, 0, + 0, 0, 103, 0, 0, 4, + 242, 32, 16, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 50, 32, + 16, 0, 1, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 8, + 194, 32, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 128, 63, 1, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 16, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 85, 0, 0, 7, + 66, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 86, 0, 0, 5, 50, 0, + 16, 0, 0, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 10, + 194, 0, 16, 0, 0, 0, + 0, 0, 6, 4, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 191, 0, 0, 0, 191, + 54, 0, 0, 5, 50, 32, + 16, 0, 1, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 7, + 18, 32, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 34, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 192, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 21, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.pdb new file mode 100644 index 00000000..863b20df Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuad.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.inc new file mode 100644 index 00000000..cbdb9f51 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.inc @@ -0,0 +1,152 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_5_0 +dcl_globalFlags refactoringAllowed +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_VSQuadDual[] = +{ + 68, 88, 66, 67, 201, 78, + 205, 202, 156, 98, 21, 181, + 88, 159, 240, 0, 73, 178, + 235, 101, 1, 0, 0, 0, + 160, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 100, 0, 0, 0, 188, 0, + 0, 0, 232, 1, 0, 0, + 73, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 1, 1, 0, 0, 83, 86, + 95, 86, 101, 114, 116, 101, + 120, 73, 100, 0, 79, 83, + 71, 78, 80, 0, 0, 0, + 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 12, + 0, 0, 83, 86, 95, 80, + 111, 115, 105, 116, 105, 111, + 110, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, + 171, 171, 83, 72, 69, 88, + 36, 1, 0, 0, 80, 0, + 1, 0, 73, 0, 0, 0, + 106, 8, 0, 1, 96, 0, + 0, 4, 18, 16, 16, 0, + 0, 0, 0, 0, 6, 0, + 0, 0, 103, 0, 0, 4, + 242, 32, 16, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 50, 32, + 16, 0, 1, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 8, + 194, 32, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 128, 63, 1, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 16, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 85, 0, 0, 7, + 66, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 86, 0, 0, 5, 50, 0, + 16, 0, 0, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 10, + 194, 0, 16, 0, 0, 0, + 0, 0, 6, 4, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 191, 0, 0, 0, 191, + 54, 0, 0, 5, 50, 32, + 16, 0, 1, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 7, + 18, 32, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 34, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 192, 62, 0, + 0, 1, 82, 84, 83, 48, + 176, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 124, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 60, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 88, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 116, 0, 0, 0, 1, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 1, 0, 0, 0, + 96, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.pdb new file mode 100644 index 00000000..8e87045b Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadDual.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.inc new file mode 100644 index 00000000..16461674 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.inc @@ -0,0 +1,142 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_5_0 +dcl_globalFlags refactoringAllowed +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE PostProcess_VSQuadNoCB[] = +{ + 68, 88, 66, 67, 187, 143, + 229, 238, 101, 188, 148, 167, + 220, 104, 114, 219, 202, 32, + 20, 7, 1, 0, 0, 0, + 100, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 100, 0, 0, 0, 188, 0, + 0, 0, 232, 1, 0, 0, + 73, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 1, 1, 0, 0, 83, 86, + 95, 86, 101, 114, 116, 101, + 120, 73, 100, 0, 79, 83, + 71, 78, 80, 0, 0, 0, + 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 12, + 0, 0, 83, 86, 95, 80, + 111, 115, 105, 116, 105, 111, + 110, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, + 171, 171, 83, 72, 69, 88, + 36, 1, 0, 0, 80, 0, + 1, 0, 73, 0, 0, 0, + 106, 8, 0, 1, 96, 0, + 0, 4, 18, 16, 16, 0, + 0, 0, 0, 0, 6, 0, + 0, 0, 103, 0, 0, 4, + 242, 32, 16, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 50, 32, + 16, 0, 1, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 8, + 194, 32, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 128, 63, 1, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 16, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 85, 0, 0, 7, + 66, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 86, 0, 0, 5, 50, 0, + 16, 0, 0, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 10, + 194, 0, 16, 0, 0, 0, + 0, 0, 6, 4, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 191, 0, 0, 0, 191, + 54, 0, 0, 5, 50, 32, + 16, 0, 1, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 7, + 18, 32, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 34, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 192, 62, 0, + 0, 1, 82, 84, 83, 48, + 116, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 64, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 36, 0, 0, 0, 1, 0, + 0, 0, 44, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.pdb new file mode 100644 index 00000000..11df5bb7 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/PostProcess_VSQuadNoCB.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc index 9c762dee..ea9404e3 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.inc @@ -84,10 +84,10 @@ ret const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = { - 68, 88, 66, 67, 49, 91, - 58, 91, 202, 8, 39, 127, - 144, 91, 27, 25, 62, 176, - 111, 125, 1, 0, 0, 0, + 68, 88, 66, 67, 214, 103, + 65, 248, 100, 121, 63, 224, + 185, 98, 41, 102, 88, 27, + 0, 143, 1, 0, 0, 0, 228, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 176, 0, 0, 0, 228, 0, @@ -406,9 +406,9 @@ const BYTE SkinnedEffect_PSSkinnedPixelLighting[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb index 7a676fb2..4724d19b 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedPixelLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc index a57bad15..f4e16b7b 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.inc @@ -40,10 +40,10 @@ ret const BYTE SkinnedEffect_PSSkinnedVertexLighting[] = { - 68, 88, 66, 67, 56, 32, - 144, 120, 96, 191, 116, 174, - 87, 115, 77, 223, 89, 46, - 247, 192, 1, 0, 0, 0, + 68, 88, 66, 67, 220, 88, + 90, 152, 18, 251, 16, 16, + 2, 68, 38, 92, 143, 10, + 65, 252, 1, 0, 0, 0, 156, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -137,9 +137,9 @@ const BYTE SkinnedEffect_PSSkinnedVertexLighting[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb index bcddd48c..24d3cb71 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLighting.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc index 7b02d75b..9b817397 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.inc @@ -37,10 +37,10 @@ ret const BYTE SkinnedEffect_PSSkinnedVertexLightingNoFog[] = { - 68, 88, 66, 67, 187, 166, - 223, 93, 128, 28, 53, 198, - 217, 1, 35, 91, 232, 253, - 156, 11, 1, 0, 0, 0, + 68, 88, 66, 67, 90, 229, + 225, 197, 247, 133, 174, 188, + 147, 170, 2, 248, 40, 215, + 83, 116, 1, 0, 0, 0, 60, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 152, 0, 0, 0, 204, 0, @@ -118,9 +118,9 @@ const BYTE SkinnedEffect_PSSkinnedVertexLightingNoFog[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb index 1671f752..d72c4516 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc index 0493c225..658e4eab 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.inc @@ -81,10 +81,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = { - 68, 88, 66, 67, 148, 252, - 58, 89, 217, 106, 8, 227, - 114, 64, 176, 13, 76, 136, - 133, 254, 1, 0, 0, 0, + 68, 88, 66, 67, 0, 202, + 151, 6, 115, 151, 95, 2, + 216, 49, 88, 37, 240, 62, + 73, 58, 1, 0, 0, 0, 204, 7, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -399,9 +399,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBones[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb index c6a8544d..97186a35 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc index 3970b297..3013fe0f 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc @@ -82,10 +82,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = { - 68, 88, 66, 67, 214, 196, - 193, 164, 229, 146, 166, 175, - 186, 98, 134, 194, 75, 176, - 148, 66, 1, 0, 0, 0, + 68, 88, 66, 67, 18, 69, + 111, 229, 243, 102, 156, 68, + 212, 106, 149, 44, 202, 108, + 194, 57, 1, 0, 0, 0, 8, 8, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -410,9 +410,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingFourBonesBn[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb index b8d5e490..a22cb131 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc index b414bcae..6c6ae07d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.inc @@ -72,10 +72,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = { - 68, 88, 66, 67, 96, 92, - 77, 118, 7, 132, 146, 159, - 200, 50, 6, 221, 6, 204, - 241, 220, 1, 0, 0, 0, + 68, 88, 66, 67, 22, 27, + 88, 237, 176, 227, 143, 213, + 248, 221, 114, 231, 171, 230, + 67, 126, 1, 0, 0, 0, 16, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -316,9 +316,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBone[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb index 67d5efae..a89fda28 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc index 51c79f46..190ceff4 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc @@ -73,10 +73,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = { - 68, 88, 66, 67, 48, 122, - 243, 160, 221, 165, 117, 235, - 112, 201, 248, 195, 238, 83, - 16, 231, 1, 0, 0, 0, + 68, 88, 66, 67, 10, 193, + 175, 103, 88, 137, 185, 88, + 80, 125, 96, 221, 246, 42, + 216, 128, 1, 0, 0, 0, 76, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -327,9 +327,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingOneBoneBn[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb index 7f451aed..65eda09c 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc index 67c6f61f..2658dc4b 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc @@ -75,10 +75,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = { - 68, 88, 66, 67, 152, 171, - 40, 137, 250, 1, 56, 211, - 95, 251, 127, 243, 117, 64, - 25, 165, 1, 0, 0, 0, + 68, 88, 66, 67, 31, 161, + 21, 123, 209, 247, 233, 27, + 159, 95, 47, 83, 76, 26, + 92, 229, 1, 0, 0, 0, 172, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -345,9 +345,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBones[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb index 9052f6d6..e9b8f6be 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc index d59a9c38..aea1d3a5 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc @@ -76,10 +76,10 @@ ret const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = { - 68, 88, 66, 67, 48, 242, - 156, 133, 211, 178, 216, 51, - 93, 186, 224, 210, 209, 87, - 23, 151, 1, 0, 0, 0, + 68, 88, 66, 67, 116, 33, + 19, 38, 205, 102, 141, 65, + 15, 181, 80, 48, 118, 168, + 232, 136, 1, 0, 0, 0, 232, 6, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 148, 1, @@ -356,9 +356,9 @@ const BYTE SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn[] = 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb index 021afab5..d9a28e94 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc index 73b3a686..cf7a9f10 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.inc @@ -116,10 +116,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = { - 68, 88, 66, 67, 242, 100, - 95, 216, 125, 83, 72, 107, - 64, 48, 178, 4, 201, 122, - 7, 225, 1, 0, 0, 0, + 68, 88, 66, 67, 108, 8, + 160, 104, 216, 166, 138, 151, + 228, 19, 186, 207, 194, 11, + 142, 164, 1, 0, 0, 0, 68, 12, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -625,9 +625,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBones[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb index e2ac9f95..0b39bcd6 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc index 181dc6bf..36a45f9d 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc @@ -117,10 +117,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = { - 68, 88, 66, 67, 107, 250, - 199, 56, 63, 201, 34, 200, - 34, 171, 16, 183, 65, 245, - 208, 229, 1, 0, 0, 0, + 68, 88, 66, 67, 181, 12, + 178, 248, 196, 67, 191, 224, + 235, 16, 32, 35, 10, 122, + 176, 3, 1, 0, 0, 0, 128, 12, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -636,9 +636,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingFourBonesBn[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb index 01b24995..aa447d25 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc index 68d48348..4076ee6e 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.inc @@ -107,10 +107,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = { - 68, 88, 66, 67, 151, 137, - 142, 75, 33, 103, 145, 46, - 16, 249, 50, 248, 6, 141, - 140, 115, 1, 0, 0, 0, + 68, 88, 66, 67, 5, 21, + 211, 225, 195, 53, 219, 129, + 207, 134, 250, 80, 253, 11, + 172, 113, 1, 0, 0, 0, 136, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -542,9 +542,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBone[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb index 79fba180..eacd3155 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc index 6aa008ce..c3bf190c 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc @@ -108,10 +108,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = { - 68, 88, 66, 67, 155, 171, - 5, 190, 30, 241, 229, 181, - 89, 54, 219, 234, 118, 126, - 34, 102, 1, 0, 0, 0, + 68, 88, 66, 67, 13, 197, + 158, 46, 33, 10, 178, 222, + 6, 33, 137, 90, 152, 85, + 207, 159, 1, 0, 0, 0, 196, 10, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -553,9 +553,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingOneBoneBn[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb index 10fbdaa9..6b20b2a2 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc index 10922672..50cf7355 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc @@ -110,10 +110,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = { - 68, 88, 66, 67, 84, 143, - 148, 182, 247, 169, 175, 254, - 195, 108, 36, 189, 137, 61, - 73, 180, 1, 0, 0, 0, + 68, 88, 66, 67, 32, 143, + 51, 150, 110, 255, 51, 63, + 141, 122, 213, 113, 146, 119, + 179, 35, 1, 0, 0, 0, 36, 11, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -571,9 +571,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBones[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb index c75dd16c..54539442 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc index 1329a132..5a272119 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc @@ -111,10 +111,10 @@ ret const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = { - 68, 88, 66, 67, 75, 223, - 16, 77, 19, 201, 44, 254, - 187, 162, 189, 146, 181, 226, - 113, 115, 1, 0, 0, 0, + 68, 88, 66, 67, 220, 128, + 33, 182, 217, 83, 33, 104, + 3, 1, 255, 93, 59, 186, + 149, 156, 1, 0, 0, 0, 96, 11, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 240, 0, 0, 0, 124, 1, @@ -582,9 +582,9 @@ const BYTE SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn[] = 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 76, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb index 370fda65..26f6fce8 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc index 29455934..f3848bc4 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.inc @@ -33,10 +33,10 @@ ret const BYTE SpriteEffect_SpritePixelShader[] = { - 68, 88, 66, 67, 35, 91, - 168, 140, 48, 49, 81, 84, - 88, 31, 89, 230, 11, 226, - 192, 145, 1, 0, 0, 0, + 68, 88, 66, 67, 248, 66, + 62, 132, 187, 230, 60, 225, + 218, 117, 233, 220, 181, 44, + 25, 66, 1, 0, 0, 0, 236, 1, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 0, 0, 0, 180, 0, @@ -97,7 +97,7 @@ const BYTE SpriteEffect_SpritePixelShader[] = 0, 0, 1, 0, 0, 0, 84, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 48, 0, + 5, 0, 0, 0, 48, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 1, 0, 0, 0, @@ -114,5 +114,5 @@ const BYTE SpriteEffect_SpritePixelShader[] = 2, 0, 0, 0, 0, 0, 0, 0, 255, 255, 127, 127, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0 + 0, 0, 5, 0, 0, 0 }; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb index 3b381057..126e8f8d 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShader.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.inc index 0065f9ff..87d96671 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.inc @@ -33,10 +33,10 @@ ret const BYTE SpriteEffect_SpritePixelShaderHeap[] = { - 68, 88, 66, 67, 165, 238, - 70, 79, 150, 125, 7, 55, - 148, 215, 240, 142, 225, 107, - 124, 147, 1, 0, 0, 0, + 68, 88, 66, 67, 26, 39, + 167, 52, 168, 95, 119, 1, + 107, 217, 228, 193, 180, 101, + 140, 151, 1, 0, 0, 0, 224, 1, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 128, 0, 0, 0, 180, 0, @@ -97,11 +97,11 @@ const BYTE SpriteEffect_SpritePixelShaderHeap[] = 0, 0, 0, 0, 0, 0, 124, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 60, 0, + 5, 0, 0, 0, 60, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, + 5, 0, 0, 0, 96, 0, 0, 0, 1, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.pdb index 35ebb8a7..9d2a6e03 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpritePixelShaderHeap.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc index 1cc28fa3..b83ff627 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc @@ -42,10 +42,10 @@ ret const BYTE SpriteEffect_SpriteVertexShader[] = { - 68, 88, 66, 67, 168, 88, - 93, 74, 124, 78, 80, 190, - 111, 14, 10, 36, 223, 83, - 90, 95, 1, 0, 0, 0, + 68, 88, 66, 67, 83, 241, + 142, 229, 6, 132, 230, 10, + 17, 252, 98, 157, 171, 157, + 215, 112, 1, 0, 0, 0, 228, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 24, 1, @@ -147,7 +147,7 @@ const BYTE SpriteEffect_SpriteVertexShader[] = 24, 0, 0, 0, 1, 0, 0, 0, 84, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 48, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 1, 0, @@ -164,6 +164,6 @@ const BYTE SpriteEffect_SpriteVertexShader[] = 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 255, 255, 127, 127, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 0 }; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb index 27fb80b1..ba810aed 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.inc index 2e9bfd57..83c70c12 100644 --- a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.inc +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.inc @@ -42,10 +42,10 @@ ret const BYTE SpriteEffect_SpriteVertexShaderHeap[] = { - 68, 88, 66, 67, 174, 17, - 66, 241, 120, 59, 166, 56, - 147, 165, 188, 35, 7, 9, - 201, 76, 1, 0, 0, 0, + 68, 88, 66, 67, 13, 130, + 132, 254, 42, 13, 104, 49, + 119, 93, 149, 2, 31, 5, + 134, 201, 1, 0, 0, 0, 216, 2, 0, 0, 4, 0, 0, 0, 48, 0, 0, 0, 164, 0, 0, 0, 24, 1, @@ -147,11 +147,11 @@ const BYTE SpriteEffect_SpriteVertexShaderHeap[] = 24, 0, 0, 0, 0, 0, 0, 0, 124, 0, 0, 0, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 60, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 96, 0, 0, 0, 1, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 1, 0, diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.pdb index a374229d..48d649ee 100644 Binary files a/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.pdb and b/Kits/DirectXTK12/Src/Shaders/Compiled/SpriteEffect_SpriteVertexShaderHeap.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc new file mode 100644 index 00000000..e93a0973 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.inc @@ -0,0 +1,168 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +mad r1.xyz, r0.xyzx, l(2.510000, 2.510000, 2.510000, 0.000000), l(0.030000, 0.030000, 0.030000, 0.000000) +mul r1.xyz, r0.xyzx, r1.xyzx +mad r2.xyz, r0.xyzx, l(2.430000, 2.430000, 2.430000, 0.000000), l(0.590000, 0.590000, 0.590000, 0.000000) +mad r0.xyz, r0.xyzx, r2.xyzx, l(0.140000, 0.140000, 0.140000, 0.000000) +div_sat o0.xyz, r1.xyzx, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSACESFilmic[] = +{ + 68, 88, 66, 67, 203, 80, + 226, 90, 110, 172, 179, 62, + 37, 109, 100, 183, 79, 112, + 56, 90, 1, 0, 0, 0, + 240, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 96, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 156, 1, 0, 0, 80, 0, + 0, 0, 103, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 8, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 215, 163, 32, 64, + 215, 163, 32, 64, 215, 163, + 32, 64, 0, 0, 0, 0, + 2, 64, 0, 0, 143, 194, + 245, 60, 143, 194, 245, 60, + 143, 194, 245, 60, 0, 0, + 0, 0, 56, 0, 0, 7, + 114, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 1, 0, 0, 0, + 50, 0, 0, 15, 114, 0, + 16, 0, 2, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 31, 133, 27, 64, 31, 133, + 27, 64, 31, 133, 27, 64, + 0, 0, 0, 0, 2, 64, + 0, 0, 61, 10, 23, 63, + 61, 10, 23, 63, 61, 10, + 23, 63, 0, 0, 0, 0, + 50, 0, 0, 12, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 2, 0, 0, 0, 2, 64, + 0, 0, 41, 92, 15, 62, + 41, 92, 15, 62, 41, 92, + 15, 62, 0, 0, 0, 0, + 14, 32, 0, 7, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb new file mode 100644 index 00000000..34f6afbc Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc new file mode 100644 index 00000000..a480922e --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc @@ -0,0 +1,184 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 3 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +mad r1.xyz, r0.xyzx, l(2.510000, 2.510000, 2.510000, 0.000000), l(0.030000, 0.030000, 0.030000, 0.000000) +mul r1.xyz, r0.xyzx, r1.xyzx +mad r2.xyz, r0.xyzx, l(2.430000, 2.430000, 2.430000, 0.000000), l(0.590000, 0.590000, 0.590000, 0.000000) +mad r0.xyz, r0.xyzx, r2.xyzx, l(0.140000, 0.140000, 0.140000, 0.000000) +div_sat r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSACESFilmic_SRGB[] = +{ + 68, 88, 66, 67, 159, 72, + 169, 249, 212, 238, 111, 21, + 162, 54, 68, 200, 35, 244, + 81, 225, 1, 0, 0, 0, + 64, 3, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 176, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 236, 1, 0, 0, 80, 0, + 0, 0, 123, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 8, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 50, 0, 0, 15, + 114, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 215, 163, 32, 64, + 215, 163, 32, 64, 215, 163, + 32, 64, 0, 0, 0, 0, + 2, 64, 0, 0, 143, 194, + 245, 60, 143, 194, 245, 60, + 143, 194, 245, 60, 0, 0, + 0, 0, 56, 0, 0, 7, + 114, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 1, 0, 0, 0, + 50, 0, 0, 15, 114, 0, + 16, 0, 2, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 31, 133, 27, 64, 31, 133, + 27, 64, 31, 133, 27, 64, + 0, 0, 0, 0, 2, 64, + 0, 0, 61, 10, 23, 63, + 61, 10, 23, 63, 61, 10, + 23, 63, 0, 0, 0, 0, + 50, 0, 0, 12, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 2, 0, 0, 0, 2, 64, + 0, 0, 41, 92, 15, 62, + 41, 92, 15, 62, 41, 92, + 15, 62, 0, 0, 0, 0, + 14, 32, 0, 7, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 47, 0, + 0, 5, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 47, 186, 232, 62, 47, 186, + 232, 62, 47, 186, 232, 62, + 0, 0, 0, 0, 25, 0, + 0, 5, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1, 82, 84, + 83, 48, 136, 0, 0, 0, + 1, 0, 0, 0, 2, 0, + 0, 0, 24, 0, 0, 0, + 1, 0, 0, 0, 84, 0, + 0, 0, 30, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0, 48, 0, 0, 0, + 2, 0, 0, 0, 5, 0, + 0, 0, 76, 0, 0, 0, + 1, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 255, 255, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 4, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 127, 127, 0, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb new file mode 100644 index 00000000..96bc1227 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.inc new file mode 100644 index 00000000..7930e918 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.inc @@ -0,0 +1,109 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +sample_indexable(texture2d)(float,float,float,float) o0.xyzw, v1.xyxx, t0.xyzw, s0 +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSCopy[] = +{ + 68, 88, 66, 67, 32, 100, + 148, 16, 157, 126, 50, 3, + 71, 208, 234, 247, 232, 83, + 221, 194, 1, 0, 0, 0, + 196, 1, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 52, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 112, 0, 0, 0, 80, 0, + 0, 0, 28, 0, 0, 0, + 106, 8, 0, 1, 90, 0, + 0, 3, 0, 96, 16, 0, + 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.pdb new file mode 100644 index 00000000..9b9b2454 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSCopy.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.inc new file mode 100644 index 00000000..63ee4c0d --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.inc @@ -0,0 +1,217 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +dp3 r1.x, l(0.627404, 0.329282, 0.043314, 0.000000), r0.xyzx +dp3 r1.y, l(0.069097, 0.919540, 0.011361, 0.000000), r0.xyzx +dp3 r1.z, l(0.016392, 0.088013, 0.895595, 0.000000), r0.xyzx +mov o0.w, r0.w +mul r0.xyz, r1.xyzx, cb0[0].yyyy +mul r0.xyz, r0.xyzx, l(0.000100, 0.000100, 0.000100, 0.000000) +log r0.xyz, |r0.xyzx| +mul r0.xyz, r0.xyzx, l(0.159302, 0.159302, 0.159302, 0.000000) +exp r0.xyz, r0.xyzx +mad r1.xyz, r0.xyzx, l(18.851563, 18.851563, 18.851563, 0.000000), l(0.835938, 0.835938, 0.835938, 0.000000) +mad r0.xyz, r0.xyzx, l(18.687500, 18.687500, 18.687500, 0.000000), l(1.000000, 1.000000, 1.000000, 0.000000) +div r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(78.843750, 78.843750, 78.843750, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSHDR10[] = +{ + 68, 88, 66, 67, 13, 51, + 110, 171, 161, 26, 149, 162, + 216, 66, 179, 76, 144, 107, + 141, 88, 1, 0, 0, 0, + 232, 3, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 88, 3, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 148, 2, 0, 0, 80, 0, + 0, 0, 165, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 2, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 16, 0, + 0, 10, 18, 0, 16, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 140, 157, 32, 63, + 166, 151, 168, 62, 154, 105, + 49, 61, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 16, 0, 0, 10, + 34, 0, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 186, 130, 141, 61, 249, 102, + 107, 63, 84, 36, 58, 60, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 16, 0, 0, 10, 66, 0, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 173, 71, + 134, 60, 68, 64, 180, 61, + 183, 69, 101, 63, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, + 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 86, 133, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 23, 183, 209, 56, + 23, 183, 209, 56, 23, 183, + 209, 56, 0, 0, 0, 0, + 47, 0, 0, 6, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 128, 129, 0, + 0, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 32, 35, 62, 0, 32, + 35, 62, 0, 32, 35, 62, + 0, 0, 0, 0, 25, 0, + 0, 5, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 50, 0, 0, 15, 114, 0, + 16, 0, 1, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 208, 150, 65, 0, 208, + 150, 65, 0, 208, 150, 65, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 86, 63, + 0, 0, 86, 63, 0, 0, + 86, 63, 0, 0, 0, 0, + 50, 0, 0, 15, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 128, 149, 65, 0, 128, + 149, 65, 0, 128, 149, 65, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 0, 0, + 14, 0, 0, 7, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 47, 0, + 0, 5, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 176, 157, 66, 0, 176, + 157, 66, 0, 176, 157, 66, + 0, 0, 0, 0, 25, 0, + 0, 5, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 62, 0, 0, 1, 82, 84, + 83, 48, 136, 0, 0, 0, + 1, 0, 0, 0, 2, 0, + 0, 0, 24, 0, 0, 0, + 1, 0, 0, 0, 84, 0, + 0, 0, 30, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0, 48, 0, 0, 0, + 2, 0, 0, 0, 5, 0, + 0, 0, 76, 0, 0, 0, + 1, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 255, 255, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 4, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 127, 127, 0, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb new file mode 100644 index 00000000..76e60731 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSHDR10.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.inc new file mode 100644 index 00000000..b6787821 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.inc @@ -0,0 +1,141 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r1.xyz, r0.xyzx, cb0[0].xxxx +mad r0.xyz, r0.xyzx, cb0[0].xxxx, l(1.000000, 1.000000, 1.000000, 0.000000) +mov o0.w, r0.w +div o0.xyz, r1.xyzx, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSReinhard[] = +{ + 68, 88, 66, 67, 112, 55, + 244, 59, 220, 81, 210, 26, + 217, 245, 241, 67, 216, 165, + 194, 56, 1, 0, 0, 0, + 96, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 208, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 12, 1, 0, 0, 80, 0, + 0, 0, 67, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 2, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 8, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 50, 0, 0, 13, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, + 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, + 14, 0, 0, 7, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb new file mode 100644 index 00000000..6ef1cbd1 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc new file mode 100644 index 00000000..1ab2b36c --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc @@ -0,0 +1,158 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 2 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul r1.xyz, r0.xyzx, cb0[0].xxxx +mad r0.xyz, r0.xyzx, cb0[0].xxxx, l(1.000000, 1.000000, 1.000000, 0.000000) +mov o0.w, r0.w +div r0.xyz, r1.xyzx, r0.xyzx +log r0.xyz, |r0.xyzx| +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSReinhard_SRGB[] = +{ + 68, 88, 66, 67, 116, 232, + 238, 103, 1, 179, 4, 84, + 114, 48, 85, 249, 163, 205, + 207, 250, 1, 0, 0, 0, + 180, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 36, 2, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 96, 1, 0, 0, 80, 0, + 0, 0, 88, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 2, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 8, 114, 0, 16, 0, + 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 50, 0, 0, 13, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 6, 128, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 128, 63, 0, 0, + 128, 63, 0, 0, 128, 63, + 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, + 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, + 14, 0, 0, 7, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 47, 0, + 0, 6, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 128, 129, 0, 0, 0, + 0, 0, 0, 0, 56, 0, + 0, 10, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 47, 186, + 232, 62, 47, 186, 232, 62, + 47, 186, 232, 62, 0, 0, + 0, 0, 25, 0, 0, 5, + 114, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb new file mode 100644 index 00000000..85c19a92 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSReinhard_SRGB.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.inc new file mode 100644 index 00000000..af6b678c --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.inc @@ -0,0 +1,125 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul_sat o0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSSaturate[] = +{ + 68, 88, 66, 67, 140, 59, + 117, 253, 26, 181, 27, 217, + 218, 161, 243, 95, 4, 189, + 223, 54, 1, 0, 0, 0, + 16, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 128, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 188, 0, 0, 0, 80, 0, + 0, 0, 47, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 32, + 0, 8, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb new file mode 100644 index 00000000..5471c389 Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc new file mode 100644 index 00000000..1fb24767 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc @@ -0,0 +1,142 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[1], immediateIndexed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +mul_sat r0.xyz, r0.xyzx, cb0[0].xxxx +mov o0.w, r0.w +log r0.xyz, r0.xyzx +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PSSaturate_SRGB[] = +{ + 68, 88, 66, 67, 56, 227, + 81, 172, 217, 182, 202, 191, + 89, 214, 248, 110, 48, 50, + 168, 186, 1, 0, 0, 0, + 96, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 208, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 12, 1, 0, 0, 80, 0, + 0, 0, 67, 0, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, + 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 139, + 194, 0, 0, 128, 67, 85, + 21, 0, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 56, 32, + 0, 8, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 6, 128, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 47, 0, 0, 5, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 56, 0, + 0, 10, 114, 0, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 47, 186, + 232, 62, 47, 186, 232, 62, + 47, 186, 232, 62, 0, 0, + 0, 0, 25, 0, 0, 5, + 114, 32, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb new file mode 100644 index 00000000..5f0867bc Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PSSaturate_SRGB.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc new file mode 100644 index 00000000..fbf35d96 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.inc @@ -0,0 +1,132 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float +// TEXCOORD 0 xy 1 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_0 +dcl_globalFlags refactoringAllowed +dcl_sampler s0, mode_default +dcl_resource_texture2d (float,float,float,float) t0 +dcl_input_ps linear v1.xy +dcl_output o0.xyzw +dcl_temps 1 +sample_indexable(texture2d)(float,float,float,float) r0.xyzw, v1.xyxx, t0.xyzw, s0 +log r0.xyz, |r0.xyzx| +mov o0.w, r0.w +mul r0.xyz, r0.xyzx, l(0.454545, 0.454545, 0.454545, 0.000000) +exp o0.xyz, r0.xyzx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_PS_SRGB[] = +{ + 68, 88, 66, 67, 123, 126, + 26, 16, 206, 123, 143, 189, + 237, 246, 154, 149, 200, 148, + 179, 126, 1, 0, 0, 0, + 52, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 136, 0, 0, 0, 188, 0, + 0, 0, 164, 1, 0, 0, + 73, 83, 71, 78, 80, 0, + 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 68, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 111, 115, 105, 116, + 105, 111, 110, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, + 71, 78, 44, 0, 0, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, + 171, 171, 83, 72, 69, 88, + 224, 0, 0, 0, 80, 0, + 0, 0, 56, 0, 0, 0, + 106, 8, 0, 1, 90, 0, + 0, 3, 0, 96, 16, 0, + 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, + 242, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 69, 0, + 0, 139, 194, 0, 0, 128, + 67, 85, 21, 0, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, + 47, 0, 0, 6, 114, 0, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 128, 129, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 47, 186, 232, 62, + 47, 186, 232, 62, 47, 186, + 232, 62, 0, 0, 0, 0, + 25, 0, 0, 5, 114, 32, + 16, 0, 0, 0, 0, 0, + 70, 2, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 136, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 84, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 48, 0, + 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 76, 0, + 0, 0, 1, 0, 0, 0, + 56, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb new file mode 100644 index 00000000..72df45cc Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_PS_SRGB.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.inc b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.inc new file mode 100644 index 00000000..3126240a --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.inc @@ -0,0 +1,146 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_VertexId 0 x 0 VERTID uint x +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Position 0 xyzw 0 POS float xyzw +// TEXCOORD 0 xy 1 NONE float xy +// +vs_5_0 +dcl_globalFlags refactoringAllowed +dcl_input_sgv v0.x, vertex_id +dcl_output_siv o0.xyzw, position +dcl_output o1.xy +dcl_temps 1 +mov o0.zw, l(0,0,0,1.000000) +and r0.x, v0.x, l(1) +ushr r0.z, v0.x, l(1) +utof r0.xy, r0.xzxx +add r0.zw, r0.xxxy, l(0.000000, 0.000000, -0.500000, -0.500000) +mov o1.xy, r0.xyxx +add o0.x, r0.z, r0.z +mul o0.y, r0.w, l(-2.000000) +ret +// Approximately 0 instruction slots used +#endif + +const BYTE ToneMap_VSQuad[] = +{ + 68, 88, 66, 67, 45, 251, + 30, 113, 122, 246, 206, 1, + 181, 34, 141, 220, 162, 237, + 175, 228, 1, 0, 0, 0, + 120, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 100, 0, 0, 0, 188, 0, + 0, 0, 232, 1, 0, 0, + 73, 83, 71, 78, 44, 0, + 0, 0, 1, 0, 0, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 1, 1, 0, 0, 83, 86, + 95, 86, 101, 114, 116, 101, + 120, 73, 100, 0, 79, 83, + 71, 78, 80, 0, 0, 0, + 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 68, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 12, + 0, 0, 83, 86, 95, 80, + 111, 115, 105, 116, 105, 111, + 110, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, + 171, 171, 83, 72, 69, 88, + 36, 1, 0, 0, 80, 0, + 1, 0, 73, 0, 0, 0, + 106, 8, 0, 1, 96, 0, + 0, 4, 18, 16, 16, 0, + 0, 0, 0, 0, 6, 0, + 0, 0, 103, 0, 0, 4, + 242, 32, 16, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 101, 0, 0, 3, 50, 32, + 16, 0, 1, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 8, + 194, 32, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 128, 63, 1, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 16, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 1, 0, + 0, 0, 85, 0, 0, 7, + 66, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 1, 0, 0, 0, + 86, 0, 0, 5, 50, 0, + 16, 0, 0, 0, 0, 0, + 134, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 10, + 194, 0, 16, 0, 0, 0, + 0, 0, 6, 4, 16, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 191, 0, 0, 0, 191, + 54, 0, 0, 5, 50, 32, + 16, 0, 1, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 7, + 18, 32, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 34, 32, + 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 0, 0, 0, 192, 62, 0, + 0, 1, 82, 84, 83, 48, + 136, 0, 0, 0, 1, 0, + 0, 0, 2, 0, 0, 0, + 24, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 0, + 30, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 48, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, + 76, 0, 0, 0, 1, 0, + 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, + 0, 0 +}; diff --git a/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.pdb b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.pdb new file mode 100644 index 00000000..13ddef3f Binary files /dev/null and b/Kits/DirectXTK12/Src/Shaders/Compiled/ToneMap_VSQuad.pdb differ diff --git a/Kits/DirectXTK12/Src/Shaders/GenerateMips.hlsl b/Kits/DirectXTK12/Src/Shaders/GenerateMips.hlsl index 3316515c..7afc35e0 100644 --- a/Kits/DirectXTK12/Src/Shaders/GenerateMips.hlsl +++ b/Kits/DirectXTK12/Src/Shaders/GenerateMips.hlsl @@ -6,7 +6,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // http://go.microsoft.com/fwlink/?LinkID=615561 -// http://create.msdn.com/en-US/education/catalog/sample/stock_effects #include "Structures.fxh" #include "RootSig.fxh" diff --git a/Kits/DirectXTK12/Src/Shaders/NormalMapEffect.fx b/Kits/DirectXTK12/Src/Shaders/NormalMapEffect.fx index eb671ecb..4cf4fa47 100644 --- a/Kits/DirectXTK12/Src/Shaders/NormalMapEffect.fx +++ b/Kits/DirectXTK12/Src/Shaders/NormalMapEffect.fx @@ -5,8 +5,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// http://go.microsoft.com/fwlink/?LinkId=248929 -// http://create.msdn.com/en-US/education/catalog/sample/stock_effects +// http://go.microsoft.com/fwlink/?LinkID=615561 Texture2D Texture : register(t0); diff --git a/Kits/DirectXTK12/Src/Shaders/PostProcess.fx b/Kits/DirectXTK12/Src/Shaders/PostProcess.fx new file mode 100644 index 00000000..38ecab93 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/PostProcess.fx @@ -0,0 +1,205 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 + +static const int MAX_SAMPLES = 16; + + +Texture2D Texture : register(t0); +sampler Sampler : register(s0); + + +cbuffer Parameters : register(b0) +{ + float4 sampleOffsets[MAX_SAMPLES]; + float4 sampleWeights[MAX_SAMPLES]; +}; + + +#include "Structures.fxh" +#include "RootSig.fxh" + + +// Vertex shader: self-created quad. +[RootSignature(PostProcessRS)] +VSInputTx VSQuad(uint vI : SV_VertexId) +{ + VSInputTx vout; + + float2 texcoord = float2(vI & 1, vI >> 1); + vout.TexCoord = texcoord; + + vout.Position = float4((texcoord.x - 0.5f) * 2, -(texcoord.y - 0.5f) * 2, 0, 1); + return vout; +} + +[RootSignature(PostProcessRSNoCB)] +VSInputTx VSQuadNoCB(uint vI : SV_VertexId) +{ + return VSQuad(vI); +} + +[RootSignature(DualPostProcessRS)] +VSInputTx VSQuadDual(uint vI : SV_VertexId) +{ + return VSQuad(vI); +} + + +//-------------------------------------------------------------------------------------- +// Pixel shader: copy. +[RootSignature(PostProcessRSNoCB)] +float4 PSCopy(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + return color; +} + + +// Pixel shader: monochrome. +[RootSignature(PostProcessRSNoCB)] +float4 PSMonochrome(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + float3 grayscale = float3(0.2125f, 0.7154f, 0.0721f); + float3 output = dot(color.rgb, grayscale); + return float4(output, color.a); +} + + +// Pixel shader: sepia. +[RootSignature(PostProcessRSNoCB)] +float4 PSSepia(VSInputTx pin) : SV_Target0 +{ + float4 color = Texture.Sample(Sampler, pin.TexCoord); + + float3 red = float3(0.393f, 0.769f, 0.189f); + float3 green = float3(0.349f, 0.686f, 0.168f); + float3 blue = float3(0.272f, 0.534f, 0.131f); + + float3 output; + output.r = dot(color.rgb, red); + output.g = dot(color.rgb, green); + output.b = dot(color.rgb, blue); + return float4(output, color.a); +} + + +// Pixel shader: down-sample 2x2. +[RootSignature(PostProcessRS)] +float4 PSDownScale2x2(VSInputTx pin) : SV_Target0 +{ + const int NUM_SAMPLES = 4; + float4 vColor = 0.0f; + + for( int i=0; i < NUM_SAMPLES; i++ ) + { + vColor += Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor / NUM_SAMPLES; +} + + +// Pixel shader: down-sample 4x4. +[RootSignature(PostProcessRS)] +float4 PSDownScale4x4(VSInputTx pin) : SV_Target0 +{ + const int NUM_SAMPLES = 16; + float4 vColor = 0.0f; + + for (int i = 0; i < NUM_SAMPLES; i++) + { + vColor += Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor / NUM_SAMPLES; +} + + +// Pixel shader: gaussian blur 5x5. +[RootSignature(PostProcessRS)] +float4 PSGaussianBlur5x5(VSInputTx pin) : SV_Target0 +{ + float4 vColor = 0.0f; + + for (int i = 0; i < 13; i++) + { + vColor += sampleWeights[i] * Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor; +} + + +// Pixel shader: bloom (extract) +[RootSignature(PostProcessRS)] +float4 PSBloomExtract(VSInputTx pin) : SV_Target0 +{ + // Uses sampleWeights[0] as 'bloom threshold' + float4 c = Texture.Sample(Sampler, pin.TexCoord); + return saturate((c - sampleWeights[0]) / (1 - sampleWeights[0])); +} + + +// Pixel shader: bloom (blur) +[RootSignature(PostProcessRS)] +float4 PSBloomBlur(VSInputTx pin) : SV_Target0 +{ + float4 vColor = 0.0f; + + // Perform a one-directional gaussian blur + for (int i = 0; i < 15; i++) + { + vColor += sampleWeights[i] * Texture.Sample(Sampler, pin.TexCoord + sampleOffsets[i].xy); + } + + return vColor; +} + + +//-------------------------------------------------------------------------------------- +Texture2D Texture2 : register(t1); + +// Pixel shader: merge +[RootSignature(DualPostProcessRS)] +float4 PSMerge(VSInputTx pin) : SV_Target0 +{ + float4 vColor = sampleWeights[0] * Texture.Sample(Sampler, pin.TexCoord); + vColor += sampleWeights[1] * Texture2.Sample(Sampler, pin.TexCoord); + return vColor; +} + + +// Pixel shader: bloom (combine) +float4 AdjustSaturation(float4 color, float saturation) +{ + float3 grayscale = float3(0.2125f, 0.7154f, 0.0721f); + float gray = dot(color.rgb, grayscale); + return lerp(gray, color, saturation); +} + +[RootSignature(DualPostProcessRS)] +float4 PSBloomCombine(VSInputTx pin) : SV_Target0 +{ + // Uses sampleWeights[0].x as base saturation, sampleWeights[0].y as bloom saturation + // Uses sampleWeights[1] as base intensity; sampleWeights[2] as bloom intensity + float4 base = Texture.Sample(Sampler, pin.TexCoord); + float4 bloom = Texture2.Sample(Sampler, pin.TexCoord); + + // Adjust color saturation and intensity. + base = AdjustSaturation(base, sampleWeights[0].x) * sampleWeights[1]; + bloom = AdjustSaturation(bloom, sampleWeights[0].y) * sampleWeights[2]; + + // Darken down the base image in areas where there is a lot of bloom, + // to prevent things looking excessively burned-out. + base *= (1 - saturate(bloom)); + + // Combine the two images. + return base + bloom; +} diff --git a/Kits/DirectXTK12/Src/Shaders/RootSig.fxh b/Kits/DirectXTK12/Src/Shaders/RootSig.fxh index 05ea3a72..dcf323c2 100644 --- a/Kits/DirectXTK12/Src/Shaders/RootSig.fxh +++ b/Kits/DirectXTK12/Src/Shaders/RootSig.fxh @@ -21,18 +21,18 @@ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ "CBV(b0),"\ -"DescriptorTable ( SRV(t0) ),"\ -"DescriptorTable ( Sampler(s0) )" +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"DescriptorTable ( Sampler(s0), visibility = SHADER_VISIBILITY_PIXEL )" #define DualTextureRS \ "RootFlags ( ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |" \ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ -"DescriptorTable ( SRV(t0) )," \ -"DescriptorTable ( Sampler(s0) )," \ -"DescriptorTable ( SRV(t1) )," \ -"DescriptorTable ( Sampler(s1) )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( Sampler(s0), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( SRV(t1), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( Sampler(s1), visibility = SHADER_VISIBILITY_PIXEL )," \ "CBV(b0)" #define NormalMapRS \ @@ -40,20 +40,20 @@ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ -"DescriptorTable ( SRV(t0) )," \ -"DescriptorTable ( SRV(t1) )," \ -"DescriptorTable ( Sampler(s0) )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( SRV(t1), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( Sampler(s0), visibility = SHADER_VISIBILITY_PIXEL )," \ "CBV(b0)," \ -"DescriptorTable ( SRV(t2) )" +"DescriptorTable ( SRV(t2), visibility = SHADER_VISIBILITY_PIXEL )" #define NormalMapRSNoSpec \ "RootFlags ( ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |" \ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ -"DescriptorTable ( SRV(t0) )," \ -"DescriptorTable ( SRV(t1) )," \ -"DescriptorTable ( Sampler(s0) )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( SRV(t1), visibility = SHADER_VISIBILITY_PIXEL )," \ +"DescriptorTable ( Sampler(s0), visibility = SHADER_VISIBILITY_PIXEL )," \ "CBV(b0)" #define GenerateMipsRS \ @@ -61,7 +61,7 @@ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS |" \ -" DENY_PIXEL_SHADER_ROOT_ACCESS )," \ +" DENY_PIXEL_SHADER_ROOT_ACCESS )," \ "RootConstants(num32BitConstants=3, b0)," \ "DescriptorTable ( SRV(t0) )," \ "DescriptorTable ( UAV(u0) )," \ @@ -76,20 +76,76 @@ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ -"DescriptorTable ( SRV(t0) ),"\ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ "CBV(b0), "\ "StaticSampler(s0,"\ " filter = FILTER_MIN_MAG_MIP_LINEAR,"\ " addressU = TEXTURE_ADDRESS_CLAMP,"\ " addressV = TEXTURE_ADDRESS_CLAMP,"\ -" addressW = TEXTURE_ADDRESS_CLAMP )" +" addressW = TEXTURE_ADDRESS_CLAMP,"\ +" visibility = SHADER_VISIBILITY_PIXEL )" #define SpriteHeapRS \ "RootFlags ( ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |" \ " DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ " DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ " DENY_HULL_SHADER_ROOT_ACCESS )," \ -"DescriptorTable ( SRV(t0) ),"\ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ "CBV(b0), " \ -"DescriptorTable ( Sampler(s0) )" +"DescriptorTable ( Sampler(s0), visibility = SHADER_VISIBILITY_PIXEL )" + +#define PostProcessRS \ +"RootFlags ( DENY_VERTEX_SHADER_ROOT_ACCESS |" \ +" DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ +" DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ +" DENY_HULL_SHADER_ROOT_ACCESS )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"CBV(b0, visibility = SHADER_VISIBILITY_PIXEL ), " \ +"StaticSampler(s0,"\ +" filter = FILTER_MIN_MAG_MIP_LINEAR,"\ +" addressU = TEXTURE_ADDRESS_CLAMP,"\ +" addressV = TEXTURE_ADDRESS_CLAMP,"\ +" addressW = TEXTURE_ADDRESS_CLAMP,"\ +" visibility = SHADER_VISIBILITY_PIXEL )" +#define PostProcessRSNoCB \ +"RootFlags ( DENY_VERTEX_SHADER_ROOT_ACCESS |" \ +" DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ +" DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ +" DENY_HULL_SHADER_ROOT_ACCESS )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"StaticSampler(s0,"\ +" filter = FILTER_MIN_MAG_MIP_LINEAR,"\ +" addressU = TEXTURE_ADDRESS_CLAMP,"\ +" addressV = TEXTURE_ADDRESS_CLAMP,"\ +" addressW = TEXTURE_ADDRESS_CLAMP,"\ +" visibility = SHADER_VISIBILITY_PIXEL )" + +#define DualPostProcessRS \ +"RootFlags ( DENY_VERTEX_SHADER_ROOT_ACCESS |" \ +" DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ +" DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ +" DENY_HULL_SHADER_ROOT_ACCESS )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"DescriptorTable ( SRV(t1), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"CBV(b0, visibility = SHADER_VISIBILITY_PIXEL ), " \ +"StaticSampler(s0,"\ +" filter = FILTER_MIN_MAG_MIP_LINEAR,"\ +" addressU = TEXTURE_ADDRESS_CLAMP,"\ +" addressV = TEXTURE_ADDRESS_CLAMP,"\ +" addressW = TEXTURE_ADDRESS_CLAMP,"\ +" visibility = SHADER_VISIBILITY_PIXEL )" + +#define ToneMapRS \ +"RootFlags ( DENY_VERTEX_SHADER_ROOT_ACCESS |" \ +" DENY_DOMAIN_SHADER_ROOT_ACCESS |" \ +" DENY_GEOMETRY_SHADER_ROOT_ACCESS |" \ +" DENY_HULL_SHADER_ROOT_ACCESS )," \ +"DescriptorTable ( SRV(t0), visibility = SHADER_VISIBILITY_PIXEL ),"\ +"CBV(b0, visibility = SHADER_VISIBILITY_PIXEL ), " \ +"StaticSampler(s0,"\ +" filter = FILTER_MIN_MAG_MIP_POINT,"\ +" addressU = TEXTURE_ADDRESS_CLAMP,"\ +" addressV = TEXTURE_ADDRESS_CLAMP,"\ +" addressW = TEXTURE_ADDRESS_CLAMP,"\ +" visibility = SHADER_VISIBILITY_PIXEL )" diff --git a/Kits/DirectXTK12/Src/Shaders/ToneMap.fx b/Kits/DirectXTK12/Src/Shaders/ToneMap.fx new file mode 100644 index 00000000..18fb91d8 --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/ToneMap.fx @@ -0,0 +1,247 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 + +Texture2D HDRTexture : register(t0); +sampler Sampler : register(s0); + + +cbuffer Parameters : register(b0) +{ + float linearExposure : packoffset(c0.x); + float paperWhiteNits : packoffset(c0.y); +}; + + +#include "Structures.fxh" +#include "RootSig.fxh" +#include "Utilities.fxh" + + +// Vertex shader: self-created quad. +[RootSignature(ToneMapRS)] +VSInputTx VSQuad(uint vI : SV_VertexId) +{ + VSInputTx vout; + + float2 texcoord = float2(vI & 1, vI >> 1); + vout.TexCoord = texcoord; + + vout.Position = float4((texcoord.x - 0.5f) * 2, -(texcoord.y - 0.5f) * 2, 0, 1); + return vout; +} + + +//-------------------------------------------------------------------------------------- +// Pixel shader: pass-through +[RootSignature(ToneMapRS)] +float4 PSCopy(VSInputTx pin) : SV_Target0 +{ + return HDRTexture.Sample(Sampler, pin.TexCoord); +} + + +// Pixel shader: saturate (clips above 1.0) +[RootSignature(ToneMapRS)] +float4 PSSaturate(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = saturate(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +// Pixel shader: reinhard operator +[RootSignature(ToneMapRS)] +float4 PSReinhard(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +// Pixel shader: ACES filmic operator +[RootSignature(ToneMapRS)] +float4 PSACESFilmic(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + return float4(sdr, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +// SRGB, using Rec.709 color primaries and a gamma 2.2 curve + +// Pixel shader: sRGB +[RootSignature(ToneMapRS)] +float4 PS_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 srgb = LinearToSRGBEst(hdr.xyz); + return float4(srgb, hdr.a); +} + + +// Pixel shader: saturate (clips above 1.0) +[RootSignature(ToneMapRS)] +float4 PSSaturate_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = saturate(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +// Pixel shader: reinhard operator +[RootSignature(ToneMapRS)] +float4 PSReinhard_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +// Pixel shader: ACES filmic operator +[RootSignature(ToneMapRS)] +float4 PSACESFilmic_SRGB(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + return float4(srgb, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +// HDR10, using Rec.2020 color primaries and ST.2084 curve + +float3 HDR10(float3 color) +{ + // Rotate from Rec.709 to Rec.2020 primaries + float3 rgb = mul(from709to2020, color); + + // ST.2084 spec defines max nits as 10,000 nits + float3 normalized = rgb * paperWhiteNits / 10000.f; + + // Apply ST.2084 curve + return LinearToST2084(normalized); +} + +[RootSignature(ToneMapRS)] +float4 PSHDR10(VSInputTx pin) : SV_Target0 +{ + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + return float4(rgb, hdr.a); +} + + +//-------------------------------------------------------------------------------------- +struct MRTOut +{ + float4 hdr : SV_Target0; + float4 sdr : SV_Target1; +}; + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_Saturate(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = saturate(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_Reinhard(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_ACESFilmic(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + output.sdr = float4(sdr, hdr.a); + + return output; +} + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_Saturate_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = saturate(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_Reinhard_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapReinhard(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} + +[RootSignature(ToneMapRS)] +MRTOut PSHDR10_ACESFilmic_SRGB(VSInputTx pin) +{ + MRTOut output; + + float4 hdr = HDRTexture.Sample(Sampler, pin.TexCoord); + float3 rgb = HDR10(hdr.xyz); + output.hdr = float4(rgb, hdr.a); + + float3 sdr = ToneMapACESFilmic(hdr.xyz * linearExposure); + float3 srgb = LinearToSRGBEst(sdr); + output.sdr = float4(srgb, hdr.a); + + return output; +} diff --git a/Kits/DirectXTK12/Src/Shaders/Utilities.fxh b/Kits/DirectXTK12/Src/Shaders/Utilities.fxh new file mode 100644 index 00000000..908d95db --- /dev/null +++ b/Kits/DirectXTK12/Src/Shaders/Utilities.fxh @@ -0,0 +1,74 @@ +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkId=248929 + + +// sRGB +// https://en.wikipedia.org/wiki/SRGB + +// Apply the (approximate) sRGB curve to linear values +float3 LinearToSRGBEst(float3 color) +{ + return pow(abs(color), 1/2.2f); +} + + +// (Approximate) sRGB to linear +float3 SRGBToLinearEst(float3 srgb) +{ + return pow(abs(srgb), 2.2f); +} + + +// HDR10 Media Profile +// https://en.wikipedia.org/wiki/High-dynamic-range_video#HDR10 + + +// Color rotation matrix to rotate Rec.709 color primaries into Rec.2020 +static const float3x3 from709to2020 = +{ + { 0.6274040f, 0.3292820f, 0.0433136f }, + { 0.0690970f, 0.9195400f, 0.0113612f }, + { 0.0163916f, 0.0880132f, 0.8955950f } +}; + + +// Apply the ST.2084 curve to normalized linear values and outputs normalized non-linear values +float3 LinearToST2084(float3 normalizedLinearValue) +{ + return pow((0.8359375f + 18.8515625f * pow(abs(normalizedLinearValue), 0.1593017578f)) / (1.0f + 18.6875f * pow(abs(normalizedLinearValue), 0.1593017578f)), 78.84375f); +} + + +// ST.2084 to linear, resulting in a linear normalized value +float3 ST2084ToLinear(float3 ST2084) +{ + return pow(max(pow(abs(ST2084), 1.0f / 78.84375f) - 0.8359375f, 0.0f) / (18.8515625f - 18.6875f * pow(abs(ST2084), 1.0f / 78.84375f)), 1.0f / 0.1593017578f); +} + + +// Reinhard tonemap operator +// Reinhard et al. "Photographic tone reproduction for digital images." ACM Transactions on Graphics. 21. 2002. +// http://www.cs.utah.edu/~reinhard/cdrom/tonemap.pdf +float3 ToneMapReinhard(float3 color) +{ + return color / (1.0f + color); +} + + +// ACES Filmic tonemap operator +// https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/ +float3 ToneMapACESFilmic(float3 x) +{ + float a = 2.51f; + float b = 0.03f; + float c = 2.43f; + float d = 0.59f; + float e = 0.14f; + return saturate((x*(a*x+b))/(x*(c*x+d)+e)); +} diff --git a/Kits/DirectXTK12/Src/SkinnedEffect.cpp b/Kits/DirectXTK12/Src/SkinnedEffect.cpp index dde6c057..fd50b55a 100644 --- a/Kits/DirectXTK12/Src/SkinnedEffect.cpp +++ b/Kits/DirectXTK12/Src/SkinnedEffect.cpp @@ -255,10 +255,10 @@ SkinnedEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effe constants.bones[i][2] = g_XMIdentityR2; } - // Create root signature + // Create root signature. { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; @@ -267,8 +267,8 @@ SkinnedEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effe CD3DX12_DESCRIPTOR_RANGE textureSamplerDescriptorRange(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSrvDescriptorRange); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerDescriptorRange); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSrvDescriptorRange, D3D12_SHADER_VISIBILITY_PIXEL); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSamplerDescriptorRange, D3D12_SHADER_VISIBILITY_PIXEL); rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; @@ -288,7 +288,7 @@ SkinnedEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effe throw std::invalid_argument("SkinnedEffect"); } - // Create pipeline state + // Create pipeline state. int sp = GetPipelineStatePermutation( (effectFlags & EffectFlags::PerPixelLightingBit) != 0); assert(sp >= 0 && sp < SkinnedEffectTraits::ShaderPermutationCount); @@ -303,7 +303,7 @@ SkinnedEffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const Effe mRootSignature, EffectBase::VertexShaderBytecode[vi], EffectBase::PixelShaderBytecode[pi], - mPipelineState.ReleaseAndGetAddressOf()); + mPipelineState.GetAddressOf()); SetDebugObjectName(mPipelineState.Get(), L"SkinnedEffect"); } diff --git a/Kits/DirectXTK12/Src/SpriteBatch.cpp b/Kits/DirectXTK12/Src/SpriteBatch.cpp index 45c371c0..18ccad06 100644 --- a/Kits/DirectXTK12/Src/SpriteBatch.cpp +++ b/Kits/DirectXTK12/Src/SpriteBatch.cpp @@ -330,7 +330,7 @@ void SpriteBatch::Impl::DeviceResources::CreateIndexBuffer(_In_ ID3D12Device* de void SpriteBatch::Impl::DeviceResources::CreateRootSignatures(_In_ ID3D12Device* device) { D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = - D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | // Only the input assembler stage needs access to the constant buffer. + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; @@ -344,10 +344,17 @@ void SpriteBatch::Impl::DeviceResources::CreateRootSignatures(_In_ ID3D12Device* D3D12_FILTER_MIN_MAG_MIP_LINEAR, D3D12_TEXTURE_ADDRESS_MODE_CLAMP, D3D12_TEXTURE_ADDRESS_MODE_CLAMP, - D3D12_TEXTURE_ADDRESS_MODE_CLAMP); + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + 0.f, + 16, + D3D12_COMPARISON_FUNC_LESS_EQUAL, + D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE, + 0.f, + D3D12_FLOAT32_MAX, + D3D12_SHADER_VISIBILITY_PIXEL); CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount - 1]; - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV, D3D12_SHADER_VISIBILITY_PIXEL); rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); CD3DX12_ROOT_SIGNATURE_DESC rsigDesc; @@ -362,9 +369,9 @@ void SpriteBatch::Impl::DeviceResources::CreateRootSignatures(_In_ ID3D12Device* CD3DX12_DESCRIPTOR_RANGE textureSampler(D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 0); CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; - rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRV, D3D12_SHADER_VISIBILITY_PIXEL); rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_ALL); - rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler); + rootParameters[RootParameterIndex::TextureSampler].InitAsDescriptorTable(1, &textureSampler, D3D12_SHADER_VISIBILITY_PIXEL); CD3DX12_ROOT_SIGNATURE_DESC rsigDesc; rsigDesc.Init(_countof(rootParameters), rootParameters, 0, nullptr, rootSignatureFlags); @@ -469,7 +476,7 @@ SpriteBatch::Impl::Impl(ID3D12Device* device, ResourceUploadBatch& upload, const ThrowIfFailed(device->CreateGraphicsPipelineState( &d3dDesc, - IID_GRAPHICS_PPV_ARGS(mPSO.ReleaseAndGetAddressOf()))); + IID_GRAPHICS_PPV_ARGS(mPSO.GetAddressOf()))); SetDebugObjectName(mPSO.Get(), L"SpriteBatch"); } diff --git a/Kits/DirectXTK12/Src/ToneMapPostProcess.cpp b/Kits/DirectXTK12/Src/ToneMapPostProcess.cpp new file mode 100644 index 00000000..a0e7ac5c --- /dev/null +++ b/Kits/DirectXTK12/Src/ToneMapPostProcess.cpp @@ -0,0 +1,426 @@ +//-------------------------------------------------------------------------------------- +// File: ToneMapPostProcess.cpp +// +// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF +// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A +// PARTICULAR PURPOSE. +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// http://go.microsoft.com/fwlink/?LinkID=615561 +//-------------------------------------------------------------------------------------- + +#include "pch.h" +#include "PostProcess.h" + +#include "AlignedNew.h" +#include "CommonStates.h" +#include "DemandCreate.h" +#include "DirectXHelpers.h" +#include "EffectPipelineStateDescription.h" +#include "GraphicsMemory.h" +#include "SharedResourcePool.h" + +using namespace DirectX; + +using Microsoft::WRL::ComPtr; + +namespace +{ + const int Dirty_ConstantBuffer = 0x01; + const int Dirty_Parameters = 0x02; + +#if defined(_XBOX_ONE) && defined(_TITLE) + const int PixelShaderCount = 15; + const int ShaderPermutationCount = 24; +#else + const int PixelShaderCount = 9; + const int ShaderPermutationCount = 12; +#endif + + // Constant buffer layout. Must match the shader! + __declspec(align(16)) struct ToneMapConstants + { + // linearExposure is .x + // paperWhiteNits is .y + XMVECTOR parameters; + }; + + static_assert((sizeof(ToneMapConstants) % 16) == 0, "CB size not padded correctly"); +} + +// Include the precompiled shader code. +namespace +{ +#if defined(_XBOX_ONE) && defined(_TITLE) + #include "Shaders/Compiled/XboxOneToneMap_VSQuad.inc" + + #include "Shaders/Compiled/XboxOneToneMap_PSCopy.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSSaturate.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSReinhard.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSACESFilmic.inc" + #include "Shaders/Compiled/XboxOneToneMap_PS_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSSaturate_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSReinhard_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSACESFilmic_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Saturate.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Reinhard.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_ACESFilmic.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Saturate_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_Reinhard_SRGB.inc" + #include "Shaders/Compiled/XboxOneToneMap_PSHDR10_ACESFilmic_SRGB.inc" +#else + #include "Shaders/Compiled/ToneMap_VSQuad.inc" + + #include "Shaders/Compiled/ToneMap_PSCopy.inc" + #include "Shaders/Compiled/ToneMap_PSSaturate.inc" + #include "Shaders/Compiled/ToneMap_PSReinhard.inc" + #include "Shaders/Compiled/ToneMap_PSACESFilmic.inc" + #include "Shaders/Compiled/ToneMap_PS_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSSaturate_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSReinhard_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSACESFilmic_SRGB.inc" + #include "Shaders/Compiled/ToneMap_PSHDR10.inc" +#endif +} + +namespace +{ + const D3D12_SHADER_BYTECODE vertexShader = + { ToneMap_VSQuad, sizeof(ToneMap_VSQuad) }; + + const D3D12_SHADER_BYTECODE pixelShaders[] = + { + { ToneMap_PSCopy, sizeof(ToneMap_PSCopy) }, + { ToneMap_PSSaturate, sizeof(ToneMap_PSSaturate) }, + { ToneMap_PSReinhard, sizeof(ToneMap_PSReinhard) }, + { ToneMap_PSACESFilmic, sizeof(ToneMap_PSACESFilmic) }, + { ToneMap_PS_SRGB, sizeof(ToneMap_PS_SRGB) }, + { ToneMap_PSSaturate_SRGB, sizeof(ToneMap_PSSaturate_SRGB) }, + { ToneMap_PSReinhard_SRGB, sizeof(ToneMap_PSReinhard_SRGB) }, + { ToneMap_PSACESFilmic_SRGB, sizeof(ToneMap_PSACESFilmic_SRGB) }, + { ToneMap_PSHDR10, sizeof(ToneMap_PSHDR10) }, + +#if defined(_XBOX_ONE) && defined(_TITLE) + // Shaders that generate both HDR10 and GameDVR SDR signals via Multiple Render Targets. + { ToneMap_PSHDR10_Saturate, sizeof(ToneMap_PSHDR10_Saturate) }, + { ToneMap_PSHDR10_Reinhard, sizeof(ToneMap_PSHDR10_Reinhard) }, + { ToneMap_PSHDR10_ACESFilmic, sizeof(ToneMap_PSHDR10_ACESFilmic) }, + { ToneMap_PSHDR10_Saturate_SRGB, sizeof(ToneMap_PSHDR10_Saturate_SRGB) }, + { ToneMap_PSHDR10_Reinhard_SRGB, sizeof(ToneMap_PSHDR10_Reinhard_SRGB) }, + { ToneMap_PSHDR10_ACESFilmic_SRGB, sizeof(ToneMap_PSHDR10_ACESFilmic_SRGB) }, +#endif + }; + + static_assert(_countof(pixelShaders) == PixelShaderCount, "array/max mismatch"); + + const int pixelShaderIndices[] = + { + // Linear EOTF + 0, // Copy + 1, // Saturate + 2, // Reinhard + 3, // ACES Filmic + + // Gamam22 EOTF + 4, // SRGB + 5, // Saturate_SRGB + 6, // Reinhard_SRGB + 7, // ACES Filmic + + // ST.2084 EOTF + 8, // HDR10 + 8, // HDR10 + 8, // HDR10 + 8, // HDR10 + +#if defined(_XBOX_ONE) && defined(_TITLE) + // MRT Linear EOTF + 9, // HDR10+Saturate + 9, // HDR10+Saturate + 10, // HDR10+Reinhard + 11, // HDR10+ACESFilmic + + // MRT Gamma22 EOTF + 12, // HDR10+Saturate_SRGB + 12, // HDR10+Saturate_SRGB + 13, // HDR10+Reinhard_SRGB + 14, // HDR10+ACESFilmic + + // MRT ST.2084 EOTF + 9, // HDR10+Saturate + 9, // HDR10+Saturate + 10, // HDR10+Reinhard + 11, // HDR10+ACESFilmic +#endif + }; + + static_assert(_countof(pixelShaderIndices) == ShaderPermutationCount, "array/max mismatch"); + + // Factory for lazily instantiating shared root signatures. + class DeviceResources + { + public: + DeviceResources(_In_ ID3D12Device* device) + : mDevice(device) + { } + + ID3D12RootSignature* GetRootSignature(const D3D12_ROOT_SIGNATURE_DESC& desc) + { + return DemandCreate(mRootSignature, mMutex, [&](ID3D12RootSignature** pResult) -> HRESULT + { + HRESULT hr = CreateRootSignature(mDevice.Get(), &desc, pResult); + + if (SUCCEEDED(hr)) + SetDebugObjectName(*pResult, L"ToneMapPostProcess"); + + return hr; + }); + } + + protected: + ComPtr mDevice; + Microsoft::WRL::ComPtr mRootSignature; + std::mutex mMutex; + }; +} + +class ToneMapPostProcess::Impl : public AlignedNew +{ +public: + Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func, bool mrt = false); + + void Process(_In_ ID3D12GraphicsCommandList* commandList); + + void SetDirtyFlag() { mDirtyFlags = INT_MAX; } + + enum RootParameterIndex + { + TextureSRV, + ConstantBuffer, + RootParameterCount + }; + + // Fields. + ToneMapConstants constants; + D3D12_GPU_DESCRIPTOR_HANDLE texture; + float linearExposure; + float paperWhiteNits; + +private: + int mDirtyFlags; + + // D3D constant buffer holds a copy of the same data as the public 'constants' field. + GraphicsResource mConstantBuffer; + + // Per instance cache of PSOs, populated with variants for each shader & layout + Microsoft::WRL::ComPtr mPipelineState; + + // Per instance root signature + ID3D12RootSignature* mRootSignature; + + // Per-device resources. + std::shared_ptr mDeviceResources; + + static SharedResourcePool deviceResourcesPool; +}; + + +// Global pool of per-device ToneMapPostProcess resources. +SharedResourcePool ToneMapPostProcess::Impl::deviceResourcesPool; + + +// Constructor. +ToneMapPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func, bool mrt) + : mDeviceResources(deviceResourcesPool.DemandCreate(device)), + linearExposure(1.f), + paperWhiteNits(200.f), + mDirtyFlags(INT_MAX), + constants{}, + texture{} +{ + if (op < 0 || op >= Operator_Max) + throw std::out_of_range("Tonemap operator not defined"); + + if (func < 0 || func > TransferFunction_Max) + throw std::out_of_range("Transfer function not defined"); + + // Create root signature. + { + D3D12_ROOT_SIGNATURE_FLAGS rootSignatureFlags = + D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS | + D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS; + + CD3DX12_DESCRIPTOR_RANGE textureSRVs(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); + + // Same as CommonStates::StaticPointClamp + CD3DX12_STATIC_SAMPLER_DESC sampler( + 0, // register + D3D12_FILTER_MIN_MAG_MIP_POINT, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + D3D12_TEXTURE_ADDRESS_MODE_CLAMP, + 0.f, + 16, + D3D12_COMPARISON_FUNC_LESS_EQUAL, + D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE, + 0.f, + D3D12_FLOAT32_MAX, + D3D12_SHADER_VISIBILITY_PIXEL); + + CD3DX12_ROOT_PARAMETER rootParameters[RootParameterIndex::RootParameterCount]; + + CD3DX12_DESCRIPTOR_RANGE texture1Range(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0); + rootParameters[RootParameterIndex::TextureSRV].InitAsDescriptorTable(1, &textureSRVs, D3D12_SHADER_VISIBILITY_PIXEL); + + // Root parameter descriptor + CD3DX12_ROOT_SIGNATURE_DESC rsigDesc = {}; + + // Constant buffer + rootParameters[RootParameterIndex::ConstantBuffer].InitAsConstantBufferView(0, 0, D3D12_SHADER_VISIBILITY_PIXEL); + + rsigDesc.Init(_countof(rootParameters), rootParameters, 1, &sampler, rootSignatureFlags); + + mRootSignature = mDeviceResources->GetRootSignature(rsigDesc); + } + + assert(mRootSignature != 0); + + // Determine shader permutation. +#if defined(_XBOX_ONE) && defined(_TITLE) + int permutation = (mrt) ? 12 : 0; + permutation += (static_cast(func) * static_cast(Operator_Max)) + static_cast(op); +#else + UNREFERENCED_PARAMETER(mrt); + int permutation = (static_cast(func) * static_cast(Operator_Max)) + static_cast(op); +#endif + + assert(permutation >= 0 && permutation < ShaderPermutationCount); + _Analysis_assume_(permutation >= 0 && permutation < ShaderPermutationCount); + + int shaderIndex = pixelShaderIndices[permutation]; + assert(shaderIndex >= 0 && shaderIndex < PixelShaderCount); + _Analysis_assume_(shaderIndex >= 0 && shaderIndex < PixelShaderCount); + + // Create pipeline state. + EffectPipelineStateDescription psd(nullptr, + CommonStates::Opaque, + CommonStates::DepthNone, + CommonStates::CullNone, + rtState, + D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE); + + psd.CreatePipelineState( + device, + mRootSignature, + vertexShader, + pixelShaders[shaderIndex], + mPipelineState.GetAddressOf()); + + SetDebugObjectName(mPipelineState.Get(), L"ToneMapPostProcess"); +} + + +// Sets our state onto the D3D device. +void ToneMapPostProcess::Impl::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + // Set the root signature. + commandList->SetGraphicsRootSignature(mRootSignature); + + // Set the texture. + if (!texture.ptr) + { + DebugTrace("ERROR: Missing texture for ToneMapPostProcess (texture %llu)\n", texture.ptr); + throw std::exception("ToneMapPostProcess"); + } + commandList->SetGraphicsRootDescriptorTable(RootParameterIndex::TextureSRV, texture); + + // Set constants. + if (mDirtyFlags & Dirty_Parameters) + { + mDirtyFlags &= ~Dirty_Parameters; + mDirtyFlags |= Dirty_ConstantBuffer; + + constants.parameters = XMVectorSet(linearExposure, paperWhiteNits, 0.f, 0.f); + } + + if (mDirtyFlags & Dirty_ConstantBuffer) + { + mDirtyFlags &= ~Dirty_ConstantBuffer; + mConstantBuffer = GraphicsMemory::Get().AllocateConstant(constants); + } + + commandList->SetGraphicsRootConstantBufferView(RootParameterIndex::ConstantBuffer, mConstantBuffer.GpuAddress()); + + // Set the pipeline state. + commandList->SetPipelineState(mPipelineState.Get()); + + // Draw quad. + commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + commandList->DrawInstanced(4, 1, 0, 0); +} + + +// Public constructor. +#if defined(_XBOX_ONE) && defined(_TITLE) +ToneMapPostProcess::ToneMapPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func, bool mrt) + : pImpl(new Impl(device, rtState, op, func, mrt)) +#else +ToneMapPostProcess::ToneMapPostProcess(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func) + : pImpl(new Impl(device, rtState, op, func)) +#endif +{ +} + + +// Move constructor. +ToneMapPostProcess::ToneMapPostProcess(ToneMapPostProcess&& moveFrom) + : pImpl(std::move(moveFrom.pImpl)) +{ +} + + +// Move assignment. +ToneMapPostProcess& ToneMapPostProcess::operator= (ToneMapPostProcess&& moveFrom) +{ + pImpl = std::move(moveFrom.pImpl); + return *this; +} + + +// Public destructor. +ToneMapPostProcess::~ToneMapPostProcess() +{ +} + + +// IPostProcess methods. +void ToneMapPostProcess::Process(_In_ ID3D12GraphicsCommandList* commandList) +{ + pImpl->Process(commandList); +} + + +// Properties +void ToneMapPostProcess::SetHDRSourceTexture(D3D12_GPU_DESCRIPTOR_HANDLE srvDescriptor) +{ + pImpl->texture = srvDescriptor; +} + + +void ToneMapPostProcess::SetExposure(float exposureValue) +{ + pImpl->linearExposure = powf(2.f, exposureValue); + pImpl->SetDirtyFlag(); +} + + +void ToneMapPostProcess::SetST2084Parameter(float paperWhiteNits) +{ + pImpl->paperWhiteNits = paperWhiteNits; + pImpl->SetDirtyFlag(); +} diff --git a/Kits/DirectXTK12/Src/WICTextureLoader.cpp b/Kits/DirectXTK12/Src/WICTextureLoader.cpp index a71b3e37..0c69e9c5 100644 --- a/Kits/DirectXTK12/Src/WICTextureLoader.cpp +++ b/Kits/DirectXTK12/Src/WICTextureLoader.cpp @@ -418,7 +418,7 @@ namespace return E_UNEXPECTED; } - hr = FC->Initialize(scaler.Get(), convertGUID, WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom); + hr = FC->Initialize(scaler.Get(), convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut); if (FAILED(hr)) return hr; @@ -446,7 +446,7 @@ namespace return E_UNEXPECTED; } - hr = FC->Initialize(frame, convertGUID, WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom); + hr = FC->Initialize(frame, convertGUID, WICBitmapDitherTypeErrorDiffusion, nullptr, 0, WICBitmapPaletteTypeMedianCut); if (FAILED(hr)) return hr;