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

- backend update.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-17 12:06:58 +02:00
parent a9ad043c36
commit bc0a55de41
5 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/common/console/c_cvars.cpp
View file

@ -1497,6 +1497,26 @@ CCMD (unset)
} }
} }
CCMD (resetcvar)
{
if (argv.argc() != 2)
{
Printf ("usage: resetcvar <variable>\n");
}
else
{
FBaseCVar *var = FindCVar (argv[1], NULL);
if (var != NULL)
{
var->ResetToDefault();
}
else
{
Printf ("No such variable: %s\n", argv[1]);
}
}
}
CCMD (get) CCMD (get)
{ {
FBaseCVar *var, *prev; FBaseCVar *var, *prev;

8
source/common/filesystem/file_ssi.cpp
View file

@ -75,7 +75,7 @@ bool FSSIFile::Open(bool quiet, int version, int lumpcount, LumpFilterInfo*)
int32_t j = (version == 2 ? 267 : 254) + (lumpcount * 121); int32_t j = (version == 2 ? 267 : 254) + (lumpcount * 121);
for (int i = 0; i < NumLumps; i+=2) for (uint32_t i = 0; i < NumLumps; i+=2)
{ {
char fn[13]; char fn[13];
int strlength = Reader.ReadUInt8(); int strlength = Reader.ReadUInt8();
@ -121,11 +121,11 @@ FResourceFile* CheckSSI(const char* filename, FileReader& file, bool quiet, Lump
char buf[72]; char buf[72];
memset(zerobuf, 0, 72); memset(zerobuf, 0, 72);
auto skipstring = [&](int length) auto skipstring = [&](size_t length)
{ {
int strlength = file.ReadUInt8(); size_t strlength = file.ReadUInt8();
if (strlength > length) return false; if (strlength > length) return false;
int count = file.Read(buf, length); size_t count = file.Read(buf, length);
buf[length] = 0; buf[length] = 0;
if (count != length || strlen(buf) != strlength) return false; if (count != length || strlen(buf) != strlength) return false;
if (length != strlength && memcmp(buf + strlength, zerobuf, length - strlength)) return false; if (length != strlength && memcmp(buf + strlength, zerobuf, length - strlength)) return false;

2
source/common/platform/win32/i_main.cpp
View file

@ -1242,7 +1242,7 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE nothing, LPWSTR cmdline, int
_CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF); _CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF);
// Use this to break at a specific allocation number. // Use this to break at a specific allocation number.
//_crtBreakAlloc = 291757; //_crtBreakAlloc = 227524;
#endif #endif
int ret = DoMain (hInstance); int ret = DoMain (hInstance);

3
source/common/textures/gametexture.h
View file

@ -366,7 +366,8 @@ enum EUpscaleFlags
UF_None = 0, UF_None = 0,
UF_Texture = 1, UF_Texture = 1,
UF_Sprite = 2, UF_Sprite = 2,
UF_Font = 4 UF_Font = 4,
UF_Skin = 8
}; };
extern int upscalemask; extern int upscalemask;

3
source/common/textures/hires/hqresize.cpp
View file

@ -75,7 +75,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_maxinputsize, 512, CVAR_ARCHIVE | CVAR_GLOB
TexMan.FlushAll(); TexMan.FlushAll();
} }
CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 15, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
TexMan.FlushAll(); TexMan.FlushAll();
UpdateUpscaleMask(); UpdateUpscaleMask();
@ -84,6 +84,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFI
CVAR (Flag, gl_texture_hqresize_textures, gl_texture_hqresize_targets, 1); CVAR (Flag, gl_texture_hqresize_textures, gl_texture_hqresize_targets, 1);
CVAR (Flag, gl_texture_hqresize_sprites, gl_texture_hqresize_targets, 2); CVAR (Flag, gl_texture_hqresize_sprites, gl_texture_hqresize_targets, 2);
CVAR (Flag, gl_texture_hqresize_fonts, gl_texture_hqresize_targets, 4); CVAR (Flag, gl_texture_hqresize_fonts, gl_texture_hqresize_targets, 4);
CVAR (Flag, gl_texture_hqresize_skins, gl_texture_hqresize_targets, 8);
CVAR(Bool, gl_texture_hqresize_multithread, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, gl_texture_hqresize_multithread, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);