From a771c8b2b75641a92f1103f882318b713f771b26 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Sun, 15 Jan 2017 15:45:14 +0100 Subject: [PATCH] Move nvidia hack before import from QtOpenGL --- src/m64py/core/vidext.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/m64py/core/vidext.py b/src/m64py/core/vidext.py index c3ba555..c75203e 100644 --- a/src/m64py/core/vidext.py +++ b/src/m64py/core/vidext.py @@ -16,11 +16,6 @@ import ctypes -from PyQt5.QtOpenGL import QGLFormat - -from sdl2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO -from sdl2 import SDL_GetNumDisplayModes, SDL_DisplayMode, SDL_GetDisplayMode - try: # nvidia hack from OpenGL import GL @@ -28,6 +23,11 @@ try: except ImportError: glimport = False +from PyQt5.QtOpenGL import QGLFormat + +from sdl2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO +from sdl2 import SDL_GetNumDisplayModes, SDL_DisplayMode, SDL_GetDisplayMode + from m64py.core.defs import * from m64py.frontend.log import log