Merge remote-tracking branch 'origin/master' into vulkan2
This commit is contained in:
commit
62fa74485d
88 changed files with 3785 additions and 3443 deletions
|
|
@ -82,7 +82,6 @@ OpenGLFrameBuffer::OpenGLFrameBuffer(void *hMonitor, bool fullscreen) :
|
|||
gl_RenderState.Reset();
|
||||
|
||||
GLRenderer = nullptr;
|
||||
InitPalette();
|
||||
}
|
||||
|
||||
OpenGLFrameBuffer::~OpenGLFrameBuffer()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue