Merge pull request #1 from alexey-lysiuk/gles_remove_post

Fix build for all platforms
This commit is contained in:
Emile Belanger 2021-03-13 15:02:26 +00:00 committed by GitHub
commit 59c0e883b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions

View file

@ -798,6 +798,7 @@ set (GLES_SOURCES
common/rendering/gles/gles_hwtexture.cpp
common/rendering/gles/gles_shader.cpp
common/rendering/gles/gles_shaderprogram.cpp
common/rendering/gles/gles_samplers.cpp
common/rendering/gles/glad/src/glad.c
)

View file

@ -53,7 +53,7 @@
#include "version.h"
#include "printf.h"
#include "gl_framebuffer.h"
#include "gles_framebuffer.h"
#ifdef HAVE_VULKAN
#include "vulkan/system/vk_framebuffer.h"
#endif
@ -462,7 +462,7 @@ public:
if (fb == nullptr)
{
fb = new OpenGLRenderer::OpenGLFrameBuffer(0, vid_fullscreen);
fb = new OpenGLESRenderer::OpenGLFrameBuffer(0, vid_fullscreen);
}
fb->SetWindow(ms_window);

View file

@ -49,7 +49,7 @@
#include "gl_system.h"
#include "gl_renderer.h"
#include "gl_framebuffer.h"
#include "gles_framebuffer.h"
#ifdef HAVE_VULKAN
#include "vulkan/system/vk_framebuffer.h"
@ -493,7 +493,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffer ()
#endif
if (fb == nullptr)
{
fb = new OpenGLRenderer::OpenGLFrameBuffer(0, vid_fullscreen);
fb = new OpenGLESRenderer::OpenGLFrameBuffer(0, vid_fullscreen);
}
return fb;

View file

@ -36,7 +36,7 @@ static void* LinuxProcAddress(const char* name)
return ret;
}
#else
#elif defined _WIN32
#include <windows.h>
@ -108,4 +108,4 @@ namespace OpenGLESRenderer
gles.numlightvectors = (gles.maxlights * 4) + 1; // maxlights lights, + size vector at the beginning
}
}
}