folkslinux
/
windows-terminal
mirror of https://github.com/microsoft/terminal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

yes this is actually right

This commit is contained in:
Mike Griese 2024-02-22 10:24:01 -06:00
parent aa3df882a9
commit e2ff838ec3
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
samples/PixelShaders/BackgroundImage.hlsl
View File

@ -1,8 +1,12 @@
// Does nothing, serves as an example of a minimal pixel shader
Texture2D shaderTexture;
// Demo shader to show passing in an image using
// experimental.pixelShaderImagePath. This shader simply displays the Terminal
// contents on top of the given image.
//
// The image loaded by the terminal will be placed into the `image` texture.
SamplerState samplerState;
// SamplerState image;
Texture2D image;
Texture2D shaderTexture : register(t0);
Texture2D image : register(t1);
cbuffer PixelShaderSettings {
float Time;
@ -13,11 +17,10 @@ cbuffer PixelShaderSettings {
float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
{
// float4 color = shaderTexture.Sample(samplerState, tex);
// float4 color = shaderTexture.Sample(image, tex);
float4 color = image.Sample(samplerState, tex);
float4 terminalColor = shaderTexture.Sample(samplerState, tex);
float4 imageColor = image.Sample(samplerState, tex);
color.r = 0; // test we're on
float4 color = lerp(imageColor, terminalColor, terminalColor.a);
return color;
}

15
src/renderer/atlas/BackendD3D.cpp
View File

@ -599,12 +599,10 @@ void BackendD3D::_setupDeviceContextState(const RenderingPayload& p)
p.deviceContext->RSSetViewports(1, &viewport);
// PS: Pixel Shader
ID3D11ShaderResourceView* resources[]{ _backgroundBitmapView.get(), _glyphAtlasView.get(), _customShaderTexture.TextureView.get() };
ID3D11ShaderResourceView* resources[]{ _backgroundBitmapView.get(), _glyphAtlasView.get() };
p.deviceContext->PSSetShader(_pixelShader.get(), nullptr, 0);
p.deviceContext->PSSetConstantBuffers(0, 1, _psConstantBuffer.addressof());
// Checking if customer shader texture is set
const UINT numViews = resources[2] ? 3 : 2;
p.deviceContext->PSSetShaderResources(0, numViews, &resources[0]);
p.deviceContext->PSSetShaderResources(0, 2, &resources[0]);
// OM: Output Merger
p.deviceContext->OMSetBlendState(_blendState.get(), nullptr, 0xffffffff);
@ -2233,7 +2231,14 @@ void BackendD3D::_executeCustomShader(RenderingPayload& p)
// PS: Pixel Shader
p.deviceContext->PSSetShader(_customPixelShader.get(), nullptr, 0);
p.deviceContext->PSSetConstantBuffers(0, 1, _customShaderConstantBuffer.addressof());
p.deviceContext->PSSetShaderResources(0, 1, _customOffscreenTextureView.addressof());
ID3D11ShaderResourceView* const resourceViews[]{
_customOffscreenTextureView.get(), // The temrinal contents
_customShaderTexture.TextureView.get(), // the experimental.pixelShaderImagePath, if there is one
};
// Checking if customer shader texture is set
const UINT numViews = resourceViews[1] ? 2 : 1;
p.deviceContext->PSSetShaderResources(0, numViews, &resourceViews[0]);
p.deviceContext->PSSetSamplers(0, 1, _customShaderSamplerState.addressof());
// OM: Output Merger