Fixed some performance issues in Windows OS.

skiko/src/jvmMain/cpp/windows/drawlayer.cc

@@ -22,6 +22,7 @@ public:
     jobject windowRef;
     HGLRC context;
     HWND handler;
+    HDC device;
 
     void update()
     {
@@ -32,6 +33,7 @@ public:
     {
         context = NULL;
         handler = NULL;
+        device = NULL;
     }
 
 private:
@@ -41,47 +43,19 @@ private:
         {
             JNIEnv *env;
             jvm->GetEnv((void **)&env, JNI_VERSION_10);
-            JAWT awt;
-            JAWT_DrawingSurface *ds = NULL;
-            JAWT_DrawingSurfaceInfo *dsi = NULL;
-            jboolean result = JNI_FALSE;
-            jint lock = 0;
-            JAWT_Win32DrawingSurfaceInfo *dsi_win;
-            awt.version = (jint)JAWT_VERSION_9;
-            result = Skiko_GetAWT(env, &awt);
-            if (result == JNI_FALSE)
-            {
-                fprintf(stderr, "JAWT_GetAWT failed! Result is JNI_FALSE\n");
-                return;
-            }
 
-            ds = awt.GetDrawingSurface(env, windowRef);
-            lock = ds->Lock(ds);
-            dsi = ds->GetDrawingSurfaceInfo(ds);
-            dsi_win = (JAWT_Win32DrawingSurfaceInfo *)dsi->platformInfo;
-
-            HWND hwnd = dsi_win->hwnd;
-            HDC hdc = GetDC(hwnd);
-            if (dsi != NULL)
+            wglMakeCurrent(device, context);
+            jclass wndClass = env->GetObjectClass(windowRef);
+            jmethodID drawMethod = env->GetMethodID(wndClass, "draw", "()V");
+            if (NULL == drawMethod)
             {
-                jvm->AttachCurrentThread((void **)&env, NULL);
-
-                wglMakeCurrent(hdc, context);
-
-                jclass wndClass = env->GetObjectClass(windowRef);
-                jmethodID drawMethod = env->GetMethodID(wndClass, "draw", "()V");
-                if (NULL == drawMethod)
-                {
-                    fprintf(stderr, "The method Window.draw() not found!\n");
-                    return;
-                }
-                env->CallVoidMethod(windowRef, drawMethod);
-                glFinish();
-                SwapBuffers(hdc);
+                fprintf(stderr, "The method Window.draw() not found!\n");
+                return;
             }
-            ds->FreeDrawingSurfaceInfo(dsi);
-            ds->Unlock(ds);
-            awt.FreeDrawingSurface(ds);
+            env->CallVoidMethod(windowRef, drawMethod);
+            glFinish();
+            wglMakeCurrent(device, NULL);
+            SwapBuffers(device);
         }
     }
 };
@@ -197,7 +171,7 @@ extern "C"
         dsi_win = (JAWT_Win32DrawingSurfaceInfo *)dsi->platformInfo;
 
         HWND hwnd = dsi_win->hwnd;
-        HDC wndHandler = GetDC(hwnd);
+        HDC device = GetDC(hwnd);
 
         if (dsi != NULL)
         {
@@ -208,10 +182,10 @@ extern "C"
 
             pixFormatDscr.iPixelType = PFD_TYPE_RGBA;
             pixFormatDscr.cColorBits = 32;
-            int iPixelFormat = ChoosePixelFormat(wndHandler, &pixFormatDscr);
-            SetPixelFormat(wndHandler, iPixelFormat, &pixFormatDscr);
-            DescribePixelFormat(wndHandler, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pixFormatDscr);
-            context = wglCreateContext(wndHandler);
+            int iPixelFormat = ChoosePixelFormat(device, &pixFormatDscr);
+            SetPixelFormat(device, iPixelFormat, &pixFormatDscr);
+            DescribePixelFormat(device, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pixFormatDscr);
+            context = wglCreateContext(device);
 
             LayersSet *layer = new LayersSet();
             windowsSet->insert(layer);
@@ -221,6 +195,7 @@ extern "C"
             layer->windowRef = windowRef;
             layer->context = context;
             layer->handler = hwnd;
+            layer->device = device;
         }
 
         ds->FreeDrawingSurfaceInfo(dsi);