From b251377cae1247bd6b752fb513a0330f3787835f Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 3 Dec 2018 21:34:48 -0800 Subject: Updated SetRenderTargets() and ClearDepthStencil() methods to take StateTransitionMode parameter --- Tests/TestApp/assets/TestRenderTargets.lua | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'Tests/TestApp/assets/TestRenderTargets.lua') diff --git a/Tests/TestApp/assets/TestRenderTargets.lua b/Tests/TestApp/assets/TestRenderTargets.lua index 2159a94..10a645e 100644 --- a/Tests/TestApp/assets/TestRenderTargets.lua +++ b/Tests/TestApp/assets/TestRenderTargets.lua @@ -131,20 +131,20 @@ Tex2DArr_Slice2DSV = TexDS_2DArr:CreateView{ViewType = "TEXTURE_VIEW_DEPTH_STENC Tex2DArr_Slice2Mip2DSV = TexDS_2DArr:CreateView{ViewType = "TEXTURE_VIEW_DEPTH_STENCIL", FirstArraySlice = 2, MostDetailedMip = 2, NumArraySlices = 1} function SetRTsHelper(RTVs, DSV) - Context.SetRenderTargets(RTVs[1], "SET_RENDER_TARGETS_FLAG_TRANSITION_ALL") - Context.SetRenderTargets(RTVs[1], RTVs[2], "SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR") - Context.SetRenderTargets(RTVs[1], RTVs[2], RTVs[3], "SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR") + Context.SetRenderTargets(RTVs[1], "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") + Context.SetRenderTargets(RTVs[1], RTVs[2], "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") + Context.SetRenderTargets(RTVs[1], RTVs[2], RTVs[3], "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") if DSV then - Context.SetRenderTargets(RTVs[1], RTVs[2], RTVs[3], DSV, {"SET_RENDER_TARGETS_FLAG_TRANSITION_DEPTH", "SET_RENDER_TARGETS_FLAG_VERIFY_STATES"}) + Context.SetRenderTargets(RTVs[1], RTVs[2], RTVs[3], DSV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") end Context.ClearRenderTarget(RTVs[1], 0.25, 0.5, 0.75, 1.0, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") Context.ClearRenderTarget(RTVs[2], 0.25, 0.5, 0.75, 1.0, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") Context.ClearRenderTarget(RTVs[3], 0.25, 0.5, 0.75, 1.0, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") if DSV then - Context.ClearDepthStencil(DSV, "CLEAR_DEPTH_STENCIL_TRANSITION_STATE_FLAG", 1.0) - Context.SetRenderTargets(RTVs[1], RTVs[2], DSV, {"SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR", "SET_RENDER_TARGETS_FLAG_TRANSITION_DEPTH"}) - Context.SetRenderTargets(RTVs[1], DSV, "SET_RENDER_TARGETS_FLAG_VERIFY_STATES") - Context.SetRenderTargets(DSV, "SET_RENDER_TARGETS_FLAG_VERIFY_STATES") + Context.ClearDepthStencil(DSV, "CLEAR_DEPTH_FLAG", 1.0, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") + Context.SetRenderTargets(RTVs[1], RTVs[2], DSV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") + Context.SetRenderTargets(RTVs[1], DSV, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") + Context.SetRenderTargets(DSV, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") end end @@ -174,8 +174,8 @@ function TestSetRenderTargets() -- It is not allowed to mix different resources as render targets. In particular, we cannot -- bind Texture2D & Texture3D at the same time if not IsGLES then - Context.SetRenderTargets(Tex2D_DefRTV[3], Tex2DArr_Slice2RTV[1], Tex2DArr_Slice2DSV, "SET_RENDER_TARGETS_FLAG_TRANSITION_ALL") - Context.SetRenderTargets(Tex2DArr_Slice2Mip2RTV[1], Tex2DArr_Slice2Mip2DSV, "SET_RENDER_TARGETS_FLAG_TRANSITION_ALL") + Context.SetRenderTargets(Tex2D_DefRTV[3], Tex2DArr_Slice2RTV[1], Tex2DArr_Slice2DSV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") + Context.SetRenderTargets(Tex2DArr_Slice2Mip2RTV[1], Tex2DArr_Slice2Mip2DSV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") end end @@ -415,24 +415,24 @@ end function Render() TestSetRenderTargets() - Context.SetRenderTargets(Tex0RTV, "SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR") -- To test FBO cache - Context.SetRenderTargets(Tex1RTV, "SET_RENDER_TARGETS_FLAG_TRANSITION_ALL") -- To test FBO cache - Context.SetRenderTargets(TexDepthTexDSV, "SET_RENDER_TARGETS_FLAG_TRANSITION_DEPTH") -- To test FBO cache - Context.SetRenderTargets(Tex0RTV, TexDepthTexDSV, "SET_RENDER_TARGETS_FLAG_VERIFY_STATES") -- To test FBO cache - Context.SetRenderTargets(Tex1RTV, TexDepthTexDSV, "SET_RENDER_TARGETS_FLAG_VERIFY_STATES") -- To test FBO cache - Context.SetRenderTargets(Tex0RTV, Tex1RTV, TexDepthTexDSV, "SET_RENDER_TARGETS_FLAG_VERIFY_STATES") -- To test FBO cache + Context.SetRenderTargets(Tex0RTV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") -- To test FBO cache + Context.SetRenderTargets(Tex1RTV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") -- To test FBO cache + Context.SetRenderTargets(TexDepthTexDSV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") -- To test FBO cache + Context.SetRenderTargets(Tex0RTV, TexDepthTexDSV, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") -- To test FBO cache + Context.SetRenderTargets(Tex1RTV, TexDepthTexDSV, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") -- To test FBO cache + Context.SetRenderTargets(Tex0RTV, Tex1RTV, TexDepthTexDSV, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") -- To test FBO cache - Context.SetRenderTargets(Tex2RTV, "SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR") + Context.SetRenderTargets(Tex2RTV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") Context.ClearRenderTarget(Tex2RTV, 0, 0, 0.75, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") - Context.SetRenderTargets(Tex0RTV, Tex1RTV, "SET_RENDER_TARGETS_FLAG_TRANSITION_ALL") + Context.SetRenderTargets(Tex0RTV, Tex1RTV, "RESOURCE_STATE_TRANSITION_MODE_TRANSITION") Context.ClearRenderTarget(Tex0RTV, 0.25, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") Context.ClearRenderTarget(Tex1RTV, 0.0, 0.5, "RESOURCE_STATE_TRANSITION_MODE_VERIFY") Context.SetViewports(VP) Context.SetScissorRects(SR) RenderToTextures() - Context.SetRenderTargets({"SET_RENDER_TARGETS_FLAG_TRANSITION_COLOR", "SET_RENDER_TARGETS_FLAG_TRANSITION_DEPTH"}) + Context.SetRenderTargets("RESOURCE_STATE_TRANSITION_MODE_TRANSITION") Context.SetViewports() BlendTextures() end -- cgit v1.2.3