BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Use Irrlicht bindings for GL call

Browse Source
This commit is contained in:
sfan5 2022-02-26 15:07:00 +01:00
parent 598efbf7f9
commit 51294163bb
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/client/shader.cpp
View File

@ -40,20 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client/tile.h" #include "client/tile.h"
#include "config.h" #include "config.h"
#if ENABLE_GLES #include <mt_opengl.h>
#ifdef _IRR_COMPILE_WITH_OGLES1_
#include <GLES/gl.h>
#else
#include <GLES2/gl2.h>
#endif
#else
#ifndef __APPLE__
#include <GL/gl.h>
#else
#define GL_SILENCE_DEPRECATION
#include <OpenGL/gl.h>
#endif
#endif
/* /*
A cache from shader name to shader path A cache from shader name to shader path
@ -667,13 +654,19 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
)"; )";
} }
// Since this is the first time we're using the GL bindings be extra careful.
// This should be removed before 5.6.0 or similar.
if (!GL.GetString) {
errorstream << "OpenGL procedures were not loaded correctly, "
"please open a bug report with details about your platform/OS." << std::endl;
abort();
}
bool use_discard = use_gles; bool use_discard = use_gles;
#ifdef __unix__
// For renderers that should use discard instead of GL_ALPHA_TEST // For renderers that should use discard instead of GL_ALPHA_TEST
const char* gl_renderer = (const char*)glGetString(GL_RENDERER); const char *renderer = reinterpret_cast<const char*>(GL.GetString(GL.RENDERER));
if (strstr(gl_renderer, "GC7000")) if (strstr(renderer, "GC7000"))
use_discard = true; use_discard = true;
#endif
if (use_discard) { if (use_discard) {
if (shaderinfo.base_material == video::EMT_TRANSPARENT_ALPHA_CHANNEL) if (shaderinfo.base_material == video::EMT_TRANSPARENT_ALPHA_CHANNEL)
shaders_header << "#define USE_DISCARD 1\n"; shaders_header << "#define USE_DISCARD 1\n";