[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55742] trunk/blender/source/blender/ editors/interface/interface_draw.c: remove workaround for [#34346], checked on applying this workaround for armatures too but it happens in more cases then I originally thought .

[Campbell Barton]

Revision: 55742
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55742
Author:   campbellbarton
Date:     2013-04-03 01:35:24 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
remove workaround for [#34346], checked on applying this workaround for armatures too but it happens in more cases then I originally thought.
for now users of opensource Nouveau and ATI drivers can't use multiple windows, the bug needs to be fixed in the driver.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_draw.c

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2013-04-03 00:00:29 UTC (rev 55741)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2013-04-03 01:35:24 UTC (rev 55742)
@@ -61,15 +61,6 @@
 /* own include */
 #include "interface_intern.h"
 
-/* only for bug workaround [#34346] */
-#if !defined(WIN32) && !defined(__APPLE__)
-#  define GPU_OSS_BUG_WOKAROUND
-#endif
-
-#ifdef GPU_OSS_BUG_WOKAROUND
-#  include "GPU_extensions.h"
-#endif
-
 static int roundboxtype = UI_CNR_ALL;
 
 void uiSetRoundBox(int type)
@@ -1245,7 +1236,6 @@
 
 void ui_draw_but_NORMAL(uiBut *but, uiWidgetColors *wcol, rcti *rect)
 {
-	static int use_displist = -1;
 	static GLuint displist = 0;
 	int a, old[8];
 	GLfloat diff[4], diffn[4] = {1.0f, 1.0f, 1.0f, 1.0f};
@@ -1294,20 +1284,12 @@
 		size = BLI_rcti_size_y(rect) / 200.f;
 	
 	glScalef(size, size, size);
-	
-#ifdef GPU_OSS_BUG_WOKAROUND
-	if (use_displist == -1) {
-		use_displist = !GPU_type_matches(GPU_DEVICE_ANY, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE);
-	}
-#endif
 
-	if (displist == 0 || use_displist == 0) {
+	if (displist == 0) {
 		GLUquadricObj *qobj;
 
-		if (use_displist) {
-			displist = glGenLists(1);
-			glNewList(displist, GL_COMPILE_AND_EXECUTE);
-		}
+		displist = glGenLists(1);
+		glNewList(displist, GL_COMPILE);
 		
 		qobj = gluNewQuadric();
 		gluQuadricDrawStyle(qobj, GLU_FILL);
@@ -1316,14 +1298,11 @@
 		glShadeModel(GL_FLAT);
 		gluDeleteQuadric(qobj);
 		
-		if (use_displist) {
-			glEndList();
-		}
+		glEndList();
 	}
-	else {
-		glCallList(displist);
-	}
 
+	glCallList(displist);
+
 	/* restore */
 	glDisable(GL_LIGHTING);
 	glDisable(GL_CULL_FACE);