diff options
| author | Dana Dahlstrom <dahlstrom@google.com> | 2020-02-12 11:00:00 -0800 |
|---|---|---|
| committer | Dana Dahlstrom <dahlstrom@google.com> | 2020-02-12 11:00:00 -0800 |
| commit | 86a106a12234cee1498a2159104fcba7f3c0efed (patch) | |
| tree | d87095c67859d1df4f0b8b34b4744aa68bcccce2 /src/share/native/sun/java2d/opengl/OGLSurfaceData.c | |
| parent | 48adcc45b3935045b1ff2013ecfd05e6f3bdb1cc (diff) | |
| parent | a7492bb2a38c1c41216929de6ba6a0a553bd4338 (diff) | |
| download | jdk8u_jdk-86a106a12234cee1498a2159104fcba7f3c0efed.tar.gz | |
Merge tag jb8u242-b1644.3
Change-Id: Ia7492bb2a38c1c41216929de6ba6a0a553bd4338
Diffstat (limited to 'src/share/native/sun/java2d/opengl/OGLSurfaceData.c')
| -rw-r--r-- | src/share/native/sun/java2d/opengl/OGLSurfaceData.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/share/native/sun/java2d/opengl/OGLSurfaceData.c b/src/share/native/sun/java2d/opengl/OGLSurfaceData.c index 83c0b59f32..8bff4a89e4 100644 --- a/src/share/native/sun/java2d/opengl/OGLSurfaceData.c +++ b/src/share/native/sun/java2d/opengl/OGLSurfaceData.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,6 @@ * The following methods are implemented in the windowing system (i.e. GLX * and WGL) source files. */ -extern jlong OGLSD_GetNativeConfigInfo(OGLSDOps *oglsdo); extern jboolean OGLSD_InitOGLWindow(JNIEnv *env, OGLSDOps *oglsdo); extern void OGLSD_DestroyOGLSurface(JNIEnv *env, OGLSDOps *oglsdo); @@ -593,11 +592,14 @@ void OGLSD_Dispose(JNIEnv *env, SurfaceDataOps *ops) { OGLSDOps *oglsdo = (OGLSDOps *)ops; - jlong pConfigInfo = OGLSD_GetNativeConfigInfo(oglsdo); + jobject graphicsConfig = oglsdo->graphicsConfig; JNU_CallStaticMethodByName(env, NULL, "sun/java2d/opengl/OGLSurfaceData", - "dispose", "(JJ)V", - ptr_to_jlong(ops), pConfigInfo); + "dispose", + "(JLsun/java2d/opengl/OGLGraphicsConfig;)V", + ptr_to_jlong(ops), graphicsConfig); + (*env)->DeleteGlobalRef(env, graphicsConfig); + oglsdo->graphicsConfig = NULL; } /** |