diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 14:10:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 14:10:05 +0400 |
| commit | e2fa58f7f3cceb89fd248d5361d875224e62de38 (patch) | |
| tree | 93e12f3b08ff272b48addd54d207e75a4f47b2c0 /source/blender/editors | |
| parent | 2c985dee976eb5b3ee6729312f046a344cb9947c (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/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1153c475339..7648c9412b7 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -489,7 +489,7 @@ static void init_internal_icons() } /* we only use a texture for cards with non-power of two */ - if(GLEW_ARB_texture_non_power_of_two) { + if(GPU_non_power_of_two_support()) { glGenTextures(1, &icongltex.id); if(icongltex.id) { diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d2988772abe..0688f9b5e0e 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -212,7 +212,7 @@ static void view3d_project_short_noclip(ARegion *ar, float *vec, short *adr) int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt) { - if(!GPU_extensions_minimum_support()) + if(!GPU_glsl_support()) return 0; if(G.f & G_PICKSEL) return 0; diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index ef3627e2b12..ea022d1b670 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -349,7 +349,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture else printf("No volume shadow\n"); - if (!GLEW_ARB_texture_non_power_of_two) { + if (!GPU_non_power_of_two_support()) { cor[0] = (float)res[0]/(float)larger_pow2(res[0]); cor[1] = (float)res[1]/(float)larger_pow2(res[1]); cor[2] = (float)res[2]/(float)larger_pow2(res[2]); |