zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: hwrenderer materials were nullptr checked but the pointers were not always properly initialized

Browse source
This commit is contained in:
Rachael Alexanderson 2020-04-21 09:41:22 -04:00
parent 62d4bbbe65
commit 8c1db978b8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/textures/hw_material.h
View file

@ -47,7 +47,7 @@ class FMaterial
bool TrimBorders(uint16_t *rect); bool TrimBorders(uint16_t *rect);
public: public:
FTexture *tex; FTexture *tex = nullptr;
FTexture *sourcetex; // in case of redirection this is different from tex. FTexture *sourcetex; // in case of redirection this is different from tex.
FMaterial(FTexture *tex, bool forceexpand); FMaterial(FTexture *tex, bool forceexpand);

2
src/rendering/hwrenderer/scene/hw_renderstate.h
View file

@ -90,7 +90,7 @@ struct FStateVec4
struct FMaterialState struct FMaterialState
{ {
FMaterial *mMaterial; FMaterial *mMaterial = nullptr;
int mClampMode; int mClampMode;
int mTranslation; int mTranslation;
int mOverrideShader; int mOverrideShader;