From 6cf0d0782badc2123b540ace94cc3234b9c462f7 Mon Sep 17 00:00:00 2001 From: papadanku Date: Sun, 24 Dec 2023 12:07:44 -0700 Subject: [PATCH] Update cOpticalFlow.fx --- shaders/cOpticalFlow.fx | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/shaders/cOpticalFlow.fx b/shaders/cOpticalFlow.fx index 6ae86f4..3c64b40 100644 --- a/shaders/cOpticalFlow.fx +++ b/shaders/cOpticalFlow.fx @@ -55,6 +55,11 @@ namespace cOpticalFlow #define VERTEX_SPACING 10 #endif + + #ifndef RENDER_OVER_BUFFER + #define RENDER_OVER_BUFFER 1 + #endif + #define LINES_X uint(BUFFER_WIDTH / VERTEX_SPACING) #define LINES_Y uint(BUFFER_HEIGHT / VERTEX_SPACING) #define NUM_LINES (LINES_X * LINES_Y) @@ -68,7 +73,6 @@ namespace cOpticalFlow CREATE_SAMPLER(SampleTempTex1, TempTex1_RG8, LINEAR, MIRROR) CREATE_SAMPLER(SampleTempTex2b, TempTex2b_RG16F, LINEAR, MIRROR) - CREATE_SAMPLER(SampleTempTex0, TempTex0_RGB10A2, LINEAR, CLAMP) struct VS2PS_Streaming { @@ -218,11 +222,6 @@ namespace cOpticalFlow return float4(Display, 1.0); } - float4 PS_Composite(VS2PS_Quad Input) : SV_TARGET0 - { - return tex2D(SampleTempTex0, Input.Tex0); - } - #define CREATE_PASS(VERTEX_SHADER, PIXEL_SHADER, RENDER_TARGET) \ pass \ { \ @@ -280,19 +279,14 @@ namespace cOpticalFlow VertexCount = NUM_LINES * 2; VertexShader = VS_Streaming; PixelShader = PS_Streaming; - ClearRenderTargets = TRUE; + ClearRenderTargets = bool(1 - RENDER_OVER_BUFFER); BlendEnable = TRUE; BlendOp = ADD; SrcBlend = SRCALPHA; DestBlend = INVSRCALPHA; - RenderTarget0 = TempTex0_RGB10A2; } - pass - { - VertexShader = VS_Quad; - PixelShader = PS_Composite; - } + #else pass {