*/}}
1
0
Переглянути джерело

GL debug adaptations to linux

YimingWu 1 рік тому
батько
коміт
c86f91656f
2 змінених файлів з 8 додано та 6 видалено
  1. 6 6
      la_kernel.c
  2. 2 0
      la_tns_kernel.c

+ 6 - 6
la_kernel.c

@@ -434,12 +434,6 @@ int la_CreateSystemWindow(laWindow *window, int SyncToVBlank){
 #ifdef _WIN32
     la_SetupGLEnviornment(window, hwnd, SyncToVBlank);
 
-
-    glEnable(GL_DEBUG_OUTPUT);
-    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-    glDebugMessageCallback(glDebugOutput, 0);
-    glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR, GL_DONT_CARE, 0, 0, GL_TRUE);
-
     RECT rc; GetClientRect(window->win, &rc);
     window->CW = rc.right - rc.left;
     window->CH = rc.bottom - rc.top;
@@ -451,6 +445,12 @@ int la_CreateSystemWindow(laWindow *window, int SyncToVBlank){
     window->CH = attr.height;
     window->glc = glc;
 #endif
+
+    glEnable(GL_DEBUG_OUTPUT);
+    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+    glDebugMessageCallback(glDebugOutput, 0);
+    glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, 0, GL_TRUE);
+
     return 1;
 };
 

+ 2 - 0
la_tns_kernel.c

@@ -127,6 +127,8 @@ void tnsSwitchToCurrentWindowContext(void *wnd){
 #ifdef __linux__
     glXMakeCurrent(MAIN.dpy,win->win, MAIN.glc);//on intel it should not be win->glc?
     //glXMakeContextCurrent(MAIN.dpy, win->win, win->win, win->glc);
+    //tnsUnbindTexture(); tnsUseNoTexture(); // reset states needed for fonts to work correctly??
+    //tnsDrawToScreen();
 #endif
 #ifdef _WIN32
     wglMakeCurrent(win->hdc, win->glc);