Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-19 14:10:05 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-19 14:10:05 +0400
commite2fa58f7f3cceb89fd248d5361d875224e62de38 (patch)
tree93e12f3b08ff272b48addd54d207e75a4f47b2c0 /source/gameengine
parent2c985dee976eb5b3ee6729312f046a344cb9947c (diff)
Fix #19669 and other: triple buffer & icon texture drawing could cause
a system crash and other issues on ATI/Apple, due to a buggy driver (similar issues reported for other OpenGL applications). For now, work around it by not using non-power-of-two textures on this combination.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp2
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Application.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index df7f35d7773..ca5faf00bb6 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -356,7 +356,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, int alw
if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
usemat = true;
- if(GPU_extensions_minimum_support())
+ if(GPU_glsl_support())
useglslmat = true;
else if(blscene->gm.matmode == GAME_MAT_GLSL)
usemat = false;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 3c989293c94..e771d12988c 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -539,7 +539,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0);
- if(GPU_extensions_minimum_support())
+ if(GPU_glsl_support())
m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0);
else if(gm->matmode == GAME_MAT_GLSL)
m_blendermat = false;