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

- Fixed bad merge of "- Clean up PolyTriangleDrawer API"

Browse source
This commit is contained in:
drfrag666 2018-05-13 19:11:29 +02:00
parent dc8d32cb69
commit 9416219ea5
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/swrenderer/r_swcanvas.cpp
View file

@ -401,7 +401,7 @@ void SWCanvas::DrawLine(DCanvas *canvas, int x0, int y0, int x1, int y1, int pal
palColor = PalFromRGB(realcolor);
}
canvas->Lock(true);
canvas->Lock();
int deltaX, deltaY, xDir;
if (y0 > y1)

2
src/swrenderer/r_swrenderer.cpp
View file

@ -207,6 +207,7 @@ void FSoftwareRenderer::WriteSavePic (player_t *player, FileWriter *file, int wi
PalEntry palette[256];
// Take a snapshot of the player's view
pic.Lock ();
if (r_polyrenderer)
{
PolyRenderer::Instance()->Viewpoint = r_viewpoint;
@ -225,6 +226,7 @@ void FSoftwareRenderer::WriteSavePic (player_t *player, FileWriter *file, int wi
}
screen->GetFlashedPalette (palette);
M_CreatePNG (file, pic.GetBuffer(), palette, SS_PAL, width, height, pic.GetPitch(), Gamma);
pic.Unlock ();
}
void FSoftwareRenderer::DrawRemainingPlayerSprites()

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

@ -380,7 +380,9 @@ namespace swrenderer
R_ExecuteSetViewSize(MainThread()->Viewport->viewpoint, MainThread()->Viewport->viewwindow);
float trueratio;
ActiveRatio(width, height, &trueratio);
screen->Lock(true);
viewport->SetViewport(MainThread(), width, height, trueratio);
screen->Unlock();
viewactive = savedviewactive;
}
@ -393,7 +395,9 @@ namespace swrenderer
int height = SCREENHEIGHT;
float trueratio;
ActiveRatio(width, height, &trueratio);
screen->Lock(true);
viewport->SetViewport(MainThread(), SCREENWIDTH, SCREENHEIGHT, trueratio);
screen->Unlock();
}
void RenderScene::Init()