diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-10-10 08:08:49 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-10-10 08:19:10 +0300 |
| commit | 33ef28068a87239f5d4e7170b2fcf7eb704da716 (patch) | |
| tree | cb3710a5d5991f95955e89075c370ce04b6777b4 /source/gameengine | |
| parent | 9ea71bc674130289d4f647c12f60ef51838665d9 (diff) | |
BGE: remove calls to GLSL support query (it's always supported)
Reworked logic in the few places that still called this. Deleted the "GLSL not supported" fallbacks.
Also removed some nearby checks for ARB_multitexture and OpenGL 1.1. Blender 2.77 removed checks like this, but game engine still has some.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 14 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 9 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 9 |
3 files changed, 5 insertions, 27 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 91683f4d6e7..d7fe8d8ce59 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -465,19 +465,9 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c if (always_use_expand_framing) sceneconverter->SetAlwaysUseExpandFraming(true); - bool usemat = false, useglslmat = false; + sceneconverter->SetMaterials(true); - if (GLEW_ARB_multitexture && GLEW_VERSION_1_1) - usemat = true; - - if (GPU_glsl_support()) - useglslmat = true; - else if (gs.matmode == GAME_MAT_GLSL) - usemat = false; - - if (usemat) - sceneconverter->SetMaterials(true); - if (useglslmat && (gs.matmode == GAME_MAT_GLSL)) + if (gs.matmode == GAME_MAT_GLSL) sceneconverter->SetGLSLMaterials(true); if (scene->gm.flag & GAME_NO_MATERIAL_CACHING) sceneconverter->SetCacheMaterials(false); diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index e697306e038..408006a0dae 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -590,13 +590,8 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 1) != 0); bool restrictAnimFPS = (gm->flag & GAME_RESTRICT_ANIM_UPDATES) != 0; - if (GLEW_ARB_multitexture && GLEW_VERSION_1_1) - m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0); - - if (GPU_glsl_support()) - m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0); - else if (m_globalSettings->matmode == GAME_MAT_GLSL) - m_blendermat = false; + m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0); + m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0); // create the canvas, rasterizer and rendertools m_canvas = new GPG_Canvas(window); diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 730e49c4918..cc7fea5ad25 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -420,14 +420,7 @@ int BL_Texture::GetMaxUnits() { if (g_max_units < 0) { GLint unit = 0; - - if (GPU_glsl_support()) { - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); - } - else if (GLEW_ARB_multitexture) { - glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit); - } - + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); g_max_units = (MAXTEX >= unit) ? unit : MAXTEX; } |