Commit: 1aff22b81d7c2264dcd88b20730851658fda9dff
Author: Mike Erwin
Date: Thu Jan 7 10:57:03 2016 -0500
Branches: master
https://developer.blender.org/rB1aff22b81d7c2264dcd88b20730851658fda9dff
OpenGL: use best available mipmap gen function
ARB_framebuffer_object works just like GL 3+ and is the preferred
method.
Fall back to older EXT_framebuffer_object if necessary.
===================================================================
M source/blender/gpu/intern/gpu_draw.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_draw.c
b/source/blender/gpu/intern/gpu_draw.c
index 2550a76..54389cc 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -298,7 +298,11 @@ static void gpu_generate_mipmap(GLenum target)
glEnable(target);
}
- glGenerateMipmapEXT(target);
+ /* TODO: simplify when we transition to GL >= 3 */
+ if (GLEW_VERSION_3_0 || GLEW_ARB_framebuffer_object)
+ glGenerateMipmap(target);
+ else if (GLEW_EXT_framebuffer_object)
+ glGenerateMipmapEXT(target);
if (is_ati && !target_enabled)
glDisable(target);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
