zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-20 18:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- use the worker threads to clear the stencil buffer"

Browse source 
This reverts commit 0a265d028d.

# Conflicts:
#	src/polyrenderer/drawers/poly_triangle.cpp
#	src/polyrenderer/drawers/poly_triangle.h
This commit is contained in:
drfrag666 2018-10-26 19:39:38 +02:00
parent 9882cd9d6b
commit 2c8b5e700f
7 changed files with 20 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/polyrenderer/drawers/poly_buffer.cpp
View file

@ -59,9 +59,10 @@ PolyStencilBuffer *PolyStencilBuffer::Instance()
return &buffer;
}
void PolyStencilBuffer::Resize(int newwidth, int newheight)
void PolyStencilBuffer::Clear(int newwidth, int newheight, uint8_t stencil_value)
{
width = newwidth;
height = newheight;
values.resize(width * height);
memset(Values(), stencil_value, width * height);
}

2
src/polyrenderer/drawers/poly_buffer.h
View file

@ -45,7 +45,7 @@ class PolyStencilBuffer
{
public:
static PolyStencilBuffer *Instance();
void Resize(int newwidth, int newheight);
void Clear(int newwidth, int newheight, uint8_t stencil_value = 0);
int Width() const { return width; }
int Height() const { return height; }
uint8_t *Values() { return values.data(); }

35
src/polyrenderer/drawers/poly_triangle.cpp
View file

@ -42,9 +42,9 @@
static bool isBgraRenderTarget = false;
void PolyTriangleDrawer::ResizeBuffers(DCanvas *canvas)
void PolyTriangleDrawer::ClearBuffers(DCanvas *canvas)
{
PolyStencilBuffer::Instance()->Resize(canvas->GetWidth(), canvas->GetHeight());
PolyStencilBuffer::Instance()->Clear(canvas->GetWidth(), canvas->GetHeight(), 0);
PolyZBuffer::Instance()->Resize(canvas->GetPitch(), canvas->GetHeight());
}
@ -53,11 +53,6 @@ bool PolyTriangleDrawer::IsBgra()
return isBgraRenderTarget;
}
void PolyTriangleDrawer::ClearStencil(const DrawerCommandQueuePtr &queue, uint8_t value)
{
queue->Push<PolyClearStencilCommand>(value);
}
void PolyTriangleDrawer::SetViewport(const DrawerCommandQueuePtr &queue, int x, int y, int width, int height, DCanvas *canvas)
{
uint8_t *dest = (uint8_t*)canvas->GetBuffer();
@ -120,21 +115,6 @@ void PolyTriangleDrawer::DrawElements(const DrawerCommandQueuePtr &queue, const
/////////////////////////////////////////////////////////////////////////////
void PolyTriangleThreadData::ClearStencil(uint8_t value)
{
auto buffer = PolyStencilBuffer::Instance();
int width = buffer->Width();
int height = buffer->Height();
uint8_t *data = buffer->Values();
data += core * width;
for (int y = core; y < height; y += num_cores)
{
memset(data, value, width);
data += num_cores * width;
}
}
void PolyTriangleThreadData::SetViewport(int x, int y, int width, int height, uint8_t *new_dest, int new_dest_width, int new_dest_height, int new_dest_pitch, bool new_dest_bgra)
{
viewport_x = x;
@ -701,17 +681,6 @@ void PolySetModelVertexShaderCommand::Execute(DrawerThread *thread)
/////////////////////////////////////////////////////////////////////////////
PolyClearStencilCommand::PolyClearStencilCommand(uint8_t value) : value(value)
{
}
void PolyClearStencilCommand::Execute(DrawerThread *thread)
{
PolyTriangleThreadData::Get(thread)->ClearStencil(value);
}
/////////////////////////////////////////////////////////////////////////////
PolySetViewportCommand::PolySetViewportCommand(int x, int y, int width, int height, uint8_t *dest, int dest_width, int dest_height, int dest_pitch, bool dest_bgra)
: x(x), y(y), width(width), height(height), dest(dest), dest_width(dest_width), dest_height(dest_height), dest_pitch(dest_pitch), dest_bgra(dest_bgra)
{

15
src/polyrenderer/drawers/poly_triangle.h
View file

@ -32,8 +32,7 @@
class PolyTriangleDrawer
{
public:
static void ResizeBuffers(DCanvas *canvas);
static void ClearStencil(const DrawerCommandQueuePtr &queue, uint8_t value);
static void ClearBuffers(DCanvas *canvas);
static void SetViewport(const DrawerCommandQueuePtr &queue, int x, int y, int width, int height, DCanvas *canvas);
static void SetCullCCW(const DrawerCommandQueuePtr &queue, bool ccw);
static void SetTwoSided(const DrawerCommandQueuePtr &queue, bool twosided);
@ -50,7 +49,6 @@ class PolyTriangleThreadData
public:
PolyTriangleThreadData(int32_t core, int32_t num_cores) : core(core), num_cores(num_cores) { }
void ClearStencil(uint8_t value);
void SetViewport(int x, int y, int width, int height, uint8_t *dest, int dest_width, int dest_height, int dest_pitch, bool dest_bgra);
void SetTransform(const Mat4f *objectToClip, const Mat4f *objectToWorld);
void SetCullCCW(bool value) { ccw = value; }
@ -159,17 +157,6 @@ private:
float interpolationFactor;
};
class PolyClearStencilCommand : public DrawerCommand
{
public:
PolyClearStencilCommand(uint8_t value);
void Execute(DrawerThread *thread) override;
private:
uint8_t value;
};
class PolySetViewportCommand : public DrawerCommand
{
public:

19
src/polyrenderer/poly_renderer.cpp
View file

@ -165,14 +165,7 @@ void PolyRenderer::RenderActorView(AActor *actor, bool dontmaplines)
r_modelscene = r_models && Models.Size() > 0;
NextStencilValue = 0;
Threads.Clear();
Threads.MainThread()->SectorPortals.clear();
Threads.MainThread()->LinePortals.clear();
Threads.MainThread()->TranslucentObjects.clear();
PolyTriangleDrawer::ResizeBuffers(RenderTarget);
PolyTriangleDrawer::ClearStencil(Threads.MainThread()->DrawQueue, 0);
ClearBuffers();
SetSceneViewport();
PolyPortalViewpoint mainViewpoint = SetupPerspectiveMatrix();
@ -194,6 +187,16 @@ void PolyRenderer::RenderRemainingPlayerSprites()
PlayerSprites.RenderRemainingSprites();
}
void PolyRenderer::ClearBuffers()
{
Threads.Clear();
PolyTriangleDrawer::ClearBuffers(RenderTarget);
NextStencilValue = 0;
Threads.MainThread()->SectorPortals.clear();
Threads.MainThread()->LinePortals.clear();
Threads.MainThread()->TranslucentObjects.clear();
}
void PolyRenderer::SetSceneViewport()
{
using namespace swrenderer;

1
src/polyrenderer/poly_renderer.h
View file

@ -70,6 +70,7 @@ public:
private:
void RenderActorView(AActor *actor, bool dontmaplines);
void ClearBuffers();
void SetSceneViewport();
RenderPolyPlayerSprites PlayerSprites;

10
src/swrenderer/scene/r_scene.cpp
View file

@ -104,10 +104,7 @@ namespace swrenderer
r_modelscene = r_models && Models.Size() > 0;
if (r_modelscene)
{
PolyTriangleDrawer::ResizeBuffers(viewport->RenderTarget);
PolyTriangleDrawer::ClearStencil(MainThread()->DrawQueue, 0);
}
PolyTriangleDrawer::ClearBuffers(viewport->RenderTarget);
if (r_clearbuffer != 0 || r_debug_draw != 0)
{
@ -288,9 +285,6 @@ namespace swrenderer
thread->OpaquePass->ResetFakingUnderwater(); // [RH] Hack to make windows into underwater areas possible
thread->Portal->SetMainPortal();
if (r_modelscene && thread->MainThread)
PolyTriangleDrawer::ClearStencil(MainThread()->DrawQueue, 0);
PolyTriangleDrawer::SetViewport(thread->DrawQueue, viewwindowx, viewwindowy, viewwidth, viewheight, thread->Viewport->RenderTarget);
// Cull things outside the range seen by this thread
@ -388,7 +382,7 @@ namespace swrenderer
viewactive = true;
viewport->SetViewport(MainThread(), width, height, MainThread()->Viewport->viewwindow.WidescreenRatio);
if (r_modelscene)
PolyTriangleDrawer::ResizeBuffers(viewport->RenderTarget);
PolyTriangleDrawer::ClearBuffers(viewport->RenderTarget);
RenderActorView(actor, dontmaplines);
DrawerWaitCycles.Clock();