diff -Nru pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/debian/bzr-builder.manifest pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/debian/bzr-builder.manifest --- pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/debian/bzr-builder.manifest 2015-05-08 18:01:46.000000000 +0000 +++ pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/debian/bzr-builder.manifest 2015-05-10 22:46:23.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}~bzr3188 -lp:pybik revid:barcc@gmx.de-20150508042053-3qa72wgm0g34yn3v +# bzr-builder format 0.3 deb-version {debupstream}~bzr3189 +lp:pybik revid:barcc@gmx.de-20150510223139-p72m6q8x084mp7k1 diff -Nru pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/debian/changelog pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/debian/changelog --- pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/debian/changelog 2015-05-08 18:01:46.000000000 +0000 +++ pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/debian/changelog 2015-05-10 22:46:23.000000000 +0000 @@ -1,8 +1,8 @@ -pybik (2.0.1~alpha1~bzr3188~ubuntu14.10.1) utopic; urgency=low +pybik (2.0.1~alpha1~bzr3189~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- B. Clausius Fri, 08 May 2015 18:01:46 +0000 + -- B. Clausius Sun, 10 May 2015 22:46:23 +0000 pybik (2.0.1~alpha1-0~ppa1) UNRELEASED; urgency=medium diff -Nru pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/pybiklib/application.py pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/pybiklib/application.py --- pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/pybiklib/application.py 2015-05-08 18:01:45.000000000 +0000 +++ pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/pybiklib/application.py 2015-05-10 22:46:23.000000000 +0000 @@ -117,6 +117,10 @@ #FIXME: don't guess, show message if window is visible QTimer.singleShot(1000, lambda: self.error_dialog(error_message)) + # Set default format before any widget is created, so that everything uses the same format. + # To test this use DEBUG_VFPS. The framerate should be then >60. + drawingarea.CubeArea.set_default_surface_format() + # UI self.ui = dialogs.UI(self, 'main.ui') from .ui.main import retranslate diff -Nru pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/pybiklib/drawingarea.py pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/pybiklib/drawingarea.py --- pybik-2.0.1~alpha1~bzr3188~ubuntu14.10.1/pybiklib/drawingarea.py 2015-05-08 18:01:45.000000000 +0000 +++ pybik-2.0.1~alpha1~bzr3189~ubuntu14.10.1/pybiklib/drawingarea.py 2015-05-10 22:46:23.000000000 +0000 @@ -152,12 +152,6 @@ def __init__(self, opts, model, **kwargs): super().__init__(**kwargs) - glformat = QSurfaceFormat() - if settings.draw.samples > 0: - glformat.setSamples(2**settings.draw.samples) - if DEBUG_MSG: - self.requested_format = glformat - self.setFormat(glformat) self.texture = None @@ -202,6 +196,16 @@ self.set_cursor() self.setMouseTracking(True) + @classmethod + def set_default_surface_format(cls): + glformat = QSurfaceFormat() + if settings.draw.samples > 0: + glformat.setSamples(2**settings.draw.samples) + if DEBUG_VFPS: + glformat.setSwapInterval(0) + cls.default_format = QSurfaceFormat.defaultFormat() + QSurfaceFormat.setDefaultFormat(glformat) + def import_gl_engine(self): if not DEBUG_PUREPYTHON: from . import _gldraw as gldraw @@ -350,7 +354,8 @@ def initializeGL(self): if DEBUG_MSG: glformat = self.format() - glrformat = self.requested_format + glrformat = QSurfaceFormat.defaultFormat() # requested format + gldformat = self.default_format def printglattr(name, *attrs): print(' {}: '.format(name), end='') def get_value(glformat, attr): @@ -360,12 +365,16 @@ return attr(glformat) values = [get_value(glformat, a) for a in attrs] rvalues = [get_value(glrformat, a) for a in attrs] - if values == rvalues: - print(*values) - else: - print(*values, end=' (') - print(*rvalues, end=')\n') - print('OpenGL format:') + dvalues = [get_value(gldformat, a) for a in attrs] + print(*values, end='') + if values != rvalues: + print(' (', end='') + print(*rvalues, end=')') + if rvalues != dvalues: + print(' [', end='') + print(*dvalues, end=']') + print() + print('Surface format (requested (), default []):') printglattr('alpha', 'alphaBufferSize') printglattr('rgb', 'redBufferSize', 'greenBufferSize', 'blueBufferSize') printglattr('depth', 'depthBufferSize')