zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Select fragment shader once per triangle

This commit is contained in:
Magnus Norddahl 2019-12-08 14:52:12 +01:00
parent f7ae955e6a
commit 42720f87cc
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rendering/polyrenderer/drawers/poly_triangle.h
View File

@ -272,6 +272,7 @@ public:
uint8_t StencilTestValue = 0; uint8_t StencilTestValue = 0;
uint8_t StencilWriteValue = 0; uint8_t StencilWriteValue = 0;
void (*FragmentShader)(int x0, int x1, PolyTriangleThreadData* thread) = nullptr;
void (*WriteColorFunc)(int y, int x0, int x1, PolyTriangleThreadData* thread) = nullptr; void (*WriteColorFunc)(int y, int x0, int x1, PolyTriangleThreadData* thread) = nullptr;
private: private:

54
src/rendering/polyrenderer/drawers/screen_triangle.cpp
View File

@ -88,7 +88,7 @@ static void WriteW(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyT
} }
#endif #endif
static void WriteDynLightArray(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyTriangleThreadData* thread) static void WriteDynLightArray(int x0, int x1, PolyTriangleThreadData* thread)
{ {
int num_lights = thread->numPolyLights; int num_lights = thread->numPolyLights;
PolyLight* lights = thread->polyLights; PolyLight* lights = thread->polyLights;
@ -1088,24 +1088,12 @@ static void ApplyVertexColor(int x0, int x1, PolyTriangleThreadData* thread)
} }
} }
static void RunShader(int x0, int x1, PolyTriangleThreadData* thread) static void MainFP(int x0, int x1, PolyTriangleThreadData* thread)
{ {
if (thread->SpecialEffect == EFF_FOGBOUNDARY) // fogboundary.fp if (thread->numPolyLights > 0)
{ WriteDynLightArray(x0, x1, thread);
EffectFogBoundary(x0, x1, thread);
return; if (thread->EffectState == SHADER_Paletted) // func_paletted
}
else if (thread->SpecialEffect == EFF_BURN) // burn.fp
{
EffectBurn(x0, x1, thread);
return;
}
else if (thread->SpecialEffect == EFF_STENCIL) // stencil.fp
{
EffectStencil(x0, x1, thread);
return;
}
else if (thread->EffectState == SHADER_Paletted) // func_paletted
{ {
FuncPaletted(x0, x1, thread); FuncPaletted(x0, x1, thread);
} }
@ -1219,6 +1207,30 @@ static void RunShader(int x0, int x1, PolyTriangleThreadData* thread)
} }
} }
static void SelectFragmentShader(PolyTriangleThreadData* thread)
{
void (*fragshader)(int x0, int x1, PolyTriangleThreadData * thread);
if (thread->SpecialEffect == EFF_FOGBOUNDARY) // fogboundary.fp
{
fragshader = &EffectFogBoundary;
}
else if (thread->SpecialEffect == EFF_BURN) // burn.fp
{
fragshader = &EffectBurn;
}
else if (thread->SpecialEffect == EFF_STENCIL) // stencil.fp
{
fragshader = &EffectStencil;
}
else
{
fragshader = &MainFP;
}
thread->FragmentShader = fragshader;
}
static void DrawSpan(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyTriangleThreadData* thread) static void DrawSpan(int y, int x0, int x1, const TriDrawTriangleArgs* args, PolyTriangleThreadData* thread)
{ {
WriteVaryings(y, x0, x1, args, thread); WriteVaryings(y, x0, x1, args, thread);
@ -1226,10 +1238,7 @@ static void DrawSpan(int y, int x0, int x1, const TriDrawTriangleArgs* args, Pol
if (thread->PushConstants->uLightLevel >= 0.0f) if (thread->PushConstants->uLightLevel >= 0.0f)
WriteLightArray(y, x0, x1, args, thread); WriteLightArray(y, x0, x1, args, thread);
if (thread->numPolyLights > 0) thread->FragmentShader(x0, x1, thread);
WriteDynLightArray(y, x0, x1, args, thread);
RunShader(x0, x1, thread);
if (thread->WriteColor) if (thread->WriteColor)
thread->WriteColorFunc(y, x0, x1, thread); thread->WriteColorFunc(y, x0, x1, thread);
@ -1362,6 +1371,7 @@ void ScreenTriangle::Draw(const TriDrawTriangleArgs* args, PolyTriangleThreadDat
if (topY >= bottomY) if (topY >= bottomY)
return; return;
SelectFragmentShader(thread);
SelectWriteColorFunc(thread); SelectWriteColorFunc(thread);
void(*testfunc)(int y, int x0, int x1, const TriDrawTriangleArgs * args, PolyTriangleThreadData * thread); void(*testfunc)(int y, int x0, int x1, const TriDrawTriangleArgs * args, PolyTriangleThreadData * thread);