From 4ba0b47665413848161f408ef8bef861907823bd Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 1 Sep 2024 23:01:39 +0200 Subject: [PATCH] Dont draw sectorstack atm --- src/common/rendering/hwrenderer/data/hw_mesh.cpp | 1 - .../rendering/hwrenderer/data/hw_meshbuilder.cpp | 1 - .../rendering/hwrenderer/data/hw_meshbuilder.h | 1 - src/rendering/hwrenderer/scene/hw_drawinfo.cpp | 14 +++++++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/common/rendering/hwrenderer/data/hw_mesh.cpp b/src/common/rendering/hwrenderer/data/hw_mesh.cpp index 46036c8ba..b66793dcf 100644 --- a/src/common/rendering/hwrenderer/data/hw_mesh.cpp +++ b/src/common/rendering/hwrenderer/data/hw_mesh.cpp @@ -35,7 +35,6 @@ void Mesh::Draw(FRenderState& renderstate) origState.applyData.RenderStyle = renderstate.mRenderStyle; origState.applyData.SpecialEffect = renderstate.mSpecialEffect; origState.applyData.TextureEnabled = renderstate.mTextureEnabled; - origState.applyData.AlphaThreshold = renderstate.mSurfaceUniforms.uAlphaThreshold; origState.applyData.FogEnabled = renderstate.mFogEnabled; origState.applyData.BrightmapEnabled = renderstate.mBrightmapEnabled; origState.applyData.TextureClamp = renderstate.mTextureClamp; diff --git a/src/common/rendering/hwrenderer/data/hw_meshbuilder.cpp b/src/common/rendering/hwrenderer/data/hw_meshbuilder.cpp index 6df23029e..9030656b6 100644 --- a/src/common/rendering/hwrenderer/data/hw_meshbuilder.cpp +++ b/src/common/rendering/hwrenderer/data/hw_meshbuilder.cpp @@ -63,7 +63,6 @@ void MeshBuilder::Apply() state.applyData.RenderStyle = mRenderStyle; state.applyData.SpecialEffect = mSpecialEffect; state.applyData.TextureEnabled = mTextureEnabled; - state.applyData.AlphaThreshold = mSurfaceUniforms.uAlphaThreshold; state.applyData.DepthFunc = mDepthFunc; state.applyData.FogEnabled = mFogEnabled; state.applyData.FogColor = (mFogColor & 0xffffff) == 0; diff --git a/src/common/rendering/hwrenderer/data/hw_meshbuilder.h b/src/common/rendering/hwrenderer/data/hw_meshbuilder.h index dbe095e0f..db32dfe06 100644 --- a/src/common/rendering/hwrenderer/data/hw_meshbuilder.h +++ b/src/common/rendering/hwrenderer/data/hw_meshbuilder.h @@ -12,7 +12,6 @@ struct MeshApplyData FRenderStyle RenderStyle; int SpecialEffect; int TextureEnabled; - float AlphaThreshold; int DepthFunc; int FogEnabled; int FogColor; diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index e112b2695..6ffd01147 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -446,13 +446,21 @@ void HWDrawInfo::CreateScene(bool drawpsprites, FRenderState& state) state.SetDepthMask(false); state.EnableTexture(false); state.SetEffect(EFF_PORTAL); + + if (!gl_portals) + state.SetColorMask(true); // For debugging where the query is + for (HWWall* wall : portals) { state.BeginQuery(); - wall->MakeVertices(state, false); - wall->RenderWall(state, HWWall::RWF_BLANK); - wall->vertcount = 0; + // sector portals not handled yet by PutWallPortal + if (wall->portaltype != PORTALTYPE_SECTORSTACK) + { + wall->MakeVertices(state, false); + wall->RenderWall(state, HWWall::RWF_BLANK); + wall->vertcount = 0; + } state.EndQuery(); }