etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-11 06:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter/blur: Don't pass bool as TEXCOORD1

Browse source 
Using a 'bool' as TEXCOORD1 is undefined behavior, so we should not abuse the intermediate shading storage like this.

Fixes #559
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-06-08 05:48:13 +02:00
parent cda430ccad
commit 1fcd141f10
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/effects/blur/box-linear.effect
View file

@ -65,20 +65,19 @@ struct VertDataIn {
struct VertDataOut { struct VertDataOut {
float4 pos : POSITION; float4 pos : POSITION;
float2 uv : TEXCOORD0; float2 uv : TEXCOORD0;
bool is_odd : TEXCOORD1;
}; };
VertDataOut VSDefault(VertDataIn vtx) { VertDataOut VSDefault(VertDataIn vtx) {
VertDataOut vert_out; VertDataOut vert_out;
vert_out.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj); vert_out.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj);
vert_out.uv = vtx.uv; vert_out.uv = vtx.uv;
vert_out.is_odd = ((int(round(pSize)) % 2) == 1);
return vert_out; return vert_out;
} }
// Blur 1 Dimensional // Blur 1 Dimensional
float4 PSBlur1D(VertDataOut vtx) : TARGET { float4 PSBlur1D(VertDataOut vtx) : TARGET {
float4 final = pImage.Sample(linearSampler, vtx.uv); float4 final = pImage.Sample(linearSampler, vtx.uv);
bool is_odd = ((int(round(pSize)) % 2) == 1);
// y = yes, s = skip, b = break // y = yes, s = skip, b = break
// Size-> | 1| 2| 3| 4| 5| 6| 7| // Size-> | 1| 2| 3| 4| 5| 6| 7|
@ -104,7 +103,7 @@ float4 PSBlur1D(VertDataOut vtx) : TARGET {
final += pImage.Sample(linearSampler, vtx.uv + nstep) * 2.; final += pImage.Sample(linearSampler, vtx.uv + nstep) * 2.;
final += pImage.Sample(linearSampler, vtx.uv - nstep) * 2.; final += pImage.Sample(linearSampler, vtx.uv - nstep) * 2.;
} }
if (vtx.is_odd) { if (is_odd) {
float2 nstep = (pImageTexel * pStepScale) * pSize; float2 nstep = (pImageTexel * pStepScale) * pSize;
final += pImage.Sample(linearSampler, vtx.uv + nstep); final += pImage.Sample(linearSampler, vtx.uv + nstep);
final += pImage.Sample(linearSampler, vtx.uv - nstep); final += pImage.Sample(linearSampler, vtx.uv - nstep);

8
data/effects/blur/gaussian-linear.effect
View file

@ -71,14 +71,12 @@ struct VertDataIn {
struct VertDataOut { struct VertDataOut {
float4 pos : POSITION; float4 pos : POSITION;
float2 uv : TEXCOORD0; float2 uv : TEXCOORD0;
bool is_odd : TEXCOORD1;
}; };
VertDataOut VSDefault(VertDataIn vtx) { VertDataOut VSDefault(VertDataIn vtx) {
VertDataOut vert_out; VertDataOut vert_out;
vert_out.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj); vert_out.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj);
vert_out.uv = vtx.uv; vert_out.uv = vtx.uv;
vert_out.is_odd = ((int(round(pSize)) % 2) == 1);
return vert_out; return vert_out;
} }
@ -89,8 +87,8 @@ float GetKernelAt(int i) {
// Blur 1 Dimensional // Blur 1 Dimensional
float4 PSBlur1D(VertDataOut vtx) : TARGET { float4 PSBlur1D(VertDataOut vtx) : TARGET {
float4 final = pImage.Sample(linearSampler, vtx.uv) float4 final = pImage.Sample(linearSampler, vtx.uv) * GetKernelAt(0);
* GetKernelAt(0); bool is_odd = ((int(round(pSize)) % 2) == 1);
// y = yes, s = skip, b = break // y = yes, s = skip, b = break
// Size-> | 1| 2| 3| 4| 5| 6| 7| // Size-> | 1| 2| 3| 4| 5| 6| 7|
@ -118,7 +116,7 @@ float4 PSBlur1D(VertDataOut vtx) : TARGET {
final += pImage.Sample(linearSampler, vtx.uv + nstep) * kernel; final += pImage.Sample(linearSampler, vtx.uv + nstep) * kernel;
final += pImage.Sample(linearSampler, vtx.uv - nstep) * kernel; final += pImage.Sample(linearSampler, vtx.uv - nstep) * kernel;
} }
if (vtx.is_odd) { if (is_odd) {
float kernel = GetKernelAt(pSize); float kernel = GetKernelAt(pSize);
float2 nstep = (pImageTexel * pStepScale) * pSize; float2 nstep = (pImageTexel * pStepScale) * pSize;
final += pImage.Sample(linearSampler, vtx.uv + nstep) * kernel; final += pImage.Sample(linearSampler, vtx.uv + nstep) * kernel;