[Bf-blender-cvs] [77641c2] master: OpenGL: remove some hacks/workarounds
Mike Erwin
noreply at git.blender.org
Thu Jan 7 22:38:52 CET 2016
Commit: 77641c28ef803a12fda3a60b0db82023bbdf83a3
Author: Mike Erwin
Date: Mon Jan 4 04:53:49 2016 -0500
Branches: master
https://developer.blender.org/rB77641c28ef803a12fda3a60b0db82023bbdf83a3
OpenGL: remove some hacks/workarounds
Everything I've tested works fine without these hacks. Variety of Mac, Linux, Windows, Intel, nVidia, AMD.
If these workarounds are for old unsupported systems let's clean house.
Reviewers: #opengl_gfx
Differential Revision: https://developer.blender.org/D1707
===================================================================
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/screen/glutil.c
===================================================================
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 98ee89a..e45e5f5 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -185,8 +185,6 @@ void gla2DGetMap(gla2DDrawInfo *di, struct rctf *rect);
void gla2DSetMap(gla2DDrawInfo *di, struct rctf *rect);
#endif
-/* intel gfx cards frontbuffer problem */
-// void bglFlush(void); /* UNUSED */
void set_inverted_drawing(int enable);
void setlinestyle(int nr);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index a870b10..b7ad911 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -814,17 +814,6 @@ void bglPolygonOffset(float viewdist, float dist)
}
}
-#if 0 /* UNUSED */
-void bglFlush(void)
-{
- glFlush();
-#ifdef __APPLE__
-// if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_MAC, GPU_DRIVER_OFFICIAL))
-// XXX myswapbuffers(); //hack to get mac intel graphics to show frontbuffer
-#endif
-}
-#endif
-
/* **** Color management helper functions for GLSL display/transform ***** */
/* Draw given image buffer on a screen using GLSL for display transform */
More information about the Bf-blender-cvs
mailing list