zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix crash when in software truecolor mode - the pitch is in pixels, not bytes

Browse source
This commit is contained in:
Magnus Norddahl 2018-04-07 19:56:54 +02:00
parent 1fc1fac2c2
commit fde87c40d2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_swscene.cpp
View file

@ -115,7 +115,7 @@ void SWSceneDrawer::RenderView(player_t *player)
}
auto buf = FBTexture->hwtex->MapBuffer();
if (!buf) I_FatalError("Unable to map buffer for software rendering");
buffer.SetBuffer(screen->GetWidth(), screen->GetHeight(), screen->GetWidth() * (swtruecolor ? 4 : 1), buf);
buffer.SetBuffer(screen->GetWidth(), screen->GetHeight(), screen->GetWidth(), buf);
SWRenderer->RenderView(player, &buffer);
FBTexture->hwtex->CreateTexture(nullptr, screen->GetWidth(), screen->GetHeight(), 0, false, 0, "swbuffer");

1
src/v_video.h
View file

@ -224,6 +224,7 @@ public:
inline int GetPitch () const { return Pitch; }
inline bool IsBgra() const { return Bgra; }
// Note: pitch here is in pixels, not bytes.
bool SetBuffer(int width, int height, int pitch, uint8_t *buffer)
{
assert(buffer);