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

- Textured automap would crash due to an additional parameter in the software renderer to the FillSimplePoly function call, causing stack issues.

Browse source
This commit is contained in:
Rachael Alexanderson 2016-11-08 15:05:23 -05:00
parent 6ef8fe2da5
commit 9413ea6edf
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/renderer/gl_renderer.h
View file

@ -216,7 +216,7 @@ public:
void FillSimplePoly(FTexture *texture, FVector2 *points, int npoints, void FillSimplePoly(FTexture *texture, FVector2 *points, int npoints,
double originx, double originy, double scalex, double scaley, double originx, double originy, double scalex, double scaley,
DAngle rotation, FDynamicColormap *colormap, int lightlevel); DAngle rotation, FDynamicColormap *colormap, int lightlevel, int bottomclip);
int PTM_BestColor (const uint32 *pal_in, int r, int g, int b, int first, int num); int PTM_BestColor (const uint32 *pal_in, int r, int g, int b, int first, int num);

2
src/gl/system/gl_framebuffer.cpp
View file

@ -464,7 +464,7 @@ void OpenGLFrameBuffer::Clear(int left, int top, int right, int bottom, int palc
void OpenGLFrameBuffer::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints, void OpenGLFrameBuffer::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints,
double originx, double originy, double scalex, double scaley, double originx, double originy, double scalex, double scaley,
DAngle rotation, FDynamicColormap *colormap, int lightlevel) DAngle rotation, FDynamicColormap *colormap, int lightlevel, int bottomclip)
{ {
if (GLRenderer != nullptr && GLRenderer->m2DDrawer != nullptr && npoints >= 3) if (GLRenderer != nullptr && GLRenderer->m2DDrawer != nullptr && npoints >= 3)
{ {

2
src/gl/system/gl_framebuffer.h
View file

@ -71,7 +71,7 @@ public:
void FillSimplePoly(FTexture *tex, FVector2 *points, int npoints, void FillSimplePoly(FTexture *tex, FVector2 *points, int npoints,
double originx, double originy, double scalex, double scaley, double originx, double originy, double scalex, double scaley,
DAngle rotation, FDynamicColormap *colormap, int lightlevel); DAngle rotation, FDynamicColormap *colormap, int lightlevel, int bottomclip);
FNativePalette *CreatePalette(FRemapTable *remap); FNativePalette *CreatePalette(FRemapTable *remap);