mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-25 05:21:16 +00:00
- fixed GLES startup
This commit is contained in:
parent
a6819bfe62
commit
7aaea65f28
2 changed files with 2 additions and 2 deletions
|
@ -122,7 +122,7 @@ void OpenGLFrameBuffer::InitializeState()
|
||||||
{
|
{
|
||||||
static bool first=true;
|
static bool first=true;
|
||||||
|
|
||||||
mPipelineNbr = gl_pipeline_depth == 0? 4 : clamp(*gl_pipeline_depth, 1, HW_MAX_PIPELINE_BUFFERS);
|
mPipelineNbr = gl_pipeline_depth == 0? std::min(4, HW_MAX_PIPELINE_BUFFERS) : clamp(*gl_pipeline_depth, 1, HW_MAX_PIPELINE_BUFFERS);
|
||||||
mPipelineType = 1;
|
mPipelineType = 1;
|
||||||
|
|
||||||
InitGLES();
|
InitGLES();
|
||||||
|
|
|
@ -73,7 +73,7 @@ CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
||||||
CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||||
|
|
||||||
// 0 means 'no pipelining' for non GLES2 and 4 elements for GLES2
|
// 0 means 'no pipelining' for non GLES2 and 4 elements for GLES2
|
||||||
CUSTOM_CVAR(Int, gl_pipeline_depth, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
CUSTOM_CVAR(Int, gl_pipeline_depth, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
|
||||||
{
|
{
|
||||||
if (self < 0 || self >= HW_MAX_PIPELINE_BUFFERS) self = 0;
|
if (self < 0 || self >= HW_MAX_PIPELINE_BUFFERS) self = 0;
|
||||||
Printf("Changing the pipeline depth requires a restart for " GAMENAME ".\n");
|
Printf("Changing the pipeline depth requires a restart for " GAMENAME ".\n");
|
||||||
|
|
Loading…
Reference in a new issue