Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Adds depth bias to PipelineState and its management to CDeviceCommandContext.

Browse Source 
Refs #2368

This was SVN commit r26495.
This commit is contained in:
Vladislav Belov 2022-02-26 21:49:32 +00:00
parent bf8fe51dea
commit 680b0215fc
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/renderer/TerrainOverlay.cpp
View File

@ -124,14 +124,6 @@ void TerrainOverlay::RenderBeforeWater(
UNUSED2(deviceCommandContext);
#warning TODO: implement TerrainOverlay::RenderOverlays for GLES
#else
// To ensure that outlines are drawn on top of the terrain correctly (and
// don't Z-fight and flicker nastily), draw them as QUADS with the LINE
// PolygonMode, and use PolygonOffset to pull them towards the camera.
// (See e.g. http://www.opengl.org/resources/faq/technical/polygonoffset.htm)
glPolygonOffset(-1.f, -1.f);
//glEnable(GL_POLYGON_OFFSET_LINE);
glEnable(GL_POLYGON_OFFSET_FILL);
StartRender();
ssize_t min_i, min_j, max_i, max_j;
@ -149,9 +141,6 @@ void TerrainOverlay::RenderBeforeWater(
ProcessTile(deviceCommandContext, m_i, m_j);
EndRender();
//glDisable(GL_POLYGON_OFFSET_LINE);
glDisable(GL_POLYGON_OFFSET_FILL);
#endif
}
@ -226,6 +215,12 @@ void TerrainOverlay::RenderTile(
Renderer::Backend::BlendOp::ADD;
pipelineStateDesc.rasterizationState.cullMode =
drawHidden ? Renderer::Backend::CullMode::NONE : Renderer::Backend::CullMode::BACK;
// To ensure that outlines are drawn on top of the terrain correctly (and
// don't Z-fight and flicker nastily), use detph bias to pull them towards
// the camera.
pipelineStateDesc.rasterizationState.depthBiasEnabled = true;
pipelineStateDesc.rasterizationState.depthBiasConstantFactor = -1.0f;
pipelineStateDesc.rasterizationState.depthBiasSlopeFactor = -1.0f;
overlayTech->BeginPass();
deviceCommandContext->SetGraphicsPipelineState(pipelineStateDesc);

3
source/renderer/backend/PipelineState.cpp
View File

@ -57,6 +57,9 @@ GraphicsPipelineStateDesc MakeDefaultGraphicsPipelineStateDesc()
desc.rasterizationState.polygonMode = PolygonMode::FILL;
desc.rasterizationState.cullMode = CullMode::BACK;
desc.rasterizationState.frontFace = FrontFace::COUNTER_CLOCKWISE;
desc.rasterizationState.depthBiasEnabled = false;
desc.rasterizationState.depthBiasConstantFactor = 0.0f;
desc.rasterizationState.depthBiasSlopeFactor = 0.0f;
return desc;
}

3
source/renderer/backend/PipelineState.h
View File

@ -154,6 +154,9 @@ struct RasterizationStateDesc
PolygonMode polygonMode;
CullMode cullMode;
FrontFace frontFace;
bool depthBiasEnabled;
float depthBiasConstantFactor;
float depthBiasSlopeFactor;
};
// TODO: Add a shader program to the graphics pipeline state.

19
source/renderer/backend/gl/DeviceCommandContext.cpp
View File

@ -590,6 +590,25 @@ void CDeviceCommandContext::SetGraphicsPipelineStateImpl(
glFrontFace(GL_CCW);
}
#if !CONFIG2_GLES
if (force ||
currentRasterizationStateDesc.depthBiasEnabled != nextRasterizationStateDesc.depthBiasEnabled)
{
if (nextRasterizationStateDesc.depthBiasEnabled)
glEnable(GL_POLYGON_OFFSET_FILL);
else
glDisable(GL_POLYGON_OFFSET_FILL);
}
if (force ||
currentRasterizationStateDesc.depthBiasConstantFactor != nextRasterizationStateDesc.depthBiasConstantFactor ||
currentRasterizationStateDesc.depthBiasSlopeFactor != nextRasterizationStateDesc.depthBiasSlopeFactor)
{
glPolygonOffset(
nextRasterizationStateDesc.depthBiasSlopeFactor,
nextRasterizationStateDesc.depthBiasConstantFactor);
}
#endif
m_GraphicsPipelineStateDesc = pipelineStateDesc;
}