From 33ef28068a87239f5d4e7170b2fcf7eb704da716 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Mon, 10 Oct 2016 01:08:49 -0400 Subject: 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. --- source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'source/gameengine/BlenderRoutines') 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); -- cgit v1.2.3