Skip to content

Commit 6dc24d6

Browse files
committed
fixup! JBR-8118 TextureWrapperImage for MTLTexture
introduce SharedTextures service
1 parent 235a231 commit 6dc24d6

File tree

2 files changed

+85
-33
lines changed

2 files changed

+85
-33
lines changed
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
* Copyright 2025 JetBrains s.r.o.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
package com.jetbrains.desktop;
27+
28+
import com.jetbrains.desktop.image.TextureWrapperImage;
29+
import com.jetbrains.exported.JBRApi;
30+
31+
import java.awt.GraphicsConfiguration;
32+
import java.awt.GraphicsEnvironment;
33+
import java.awt.Image;
34+
35+
@JBRApi.Service
36+
@JBRApi.Provides("SharedTextures")
37+
class SharedTextures {
38+
public final static int METAL_TEXTURE_TYPE = 1;
39+
40+
private final int textureType;
41+
42+
private static SharedTextures create() {
43+
return new SharedTextures();
44+
}
45+
46+
private SharedTextures() {
47+
textureType = getTextureTypeImpl();
48+
if (textureType == 0) {
49+
throw new JBRApi.ServiceNotAvailableException();
50+
}
51+
}
52+
53+
int getTextureType() {
54+
return textureType;
55+
}
56+
57+
Image wrapTexture(GraphicsConfiguration gc, long texture) {
58+
return new TextureWrapperImage(gc, texture);
59+
}
60+
61+
private static int getTextureTypeImpl() {
62+
GraphicsConfiguration gc = GraphicsEnvironment
63+
.getLocalGraphicsEnvironment()
64+
.getDefaultScreenDevice()
65+
.getDefaultConfiguration();
66+
try {
67+
if (isInstanceOf(gc, "sun.java2d.metal.MTLGraphicsConfig")) {
68+
return 1;
69+
}
70+
} catch (Exception e) {
71+
throw new InternalError("Unexpected exception during reflection", e);
72+
}
73+
74+
return 0;
75+
}
76+
77+
private static boolean isInstanceOf(Object obj, String className) {
78+
try {
79+
var clazz = Class.forName(className);
80+
return clazz.isInstance(obj);
81+
} catch (ClassNotFoundException e) {
82+
return false;
83+
}
84+
}
85+
}

src/java.desktop/share/classes/com/jetbrains/desktop/image/TextureWrapperImage.java

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
package com.jetbrains.desktop.image;
2727

28-
import com.jetbrains.exported.JBRApi;
2928
import sun.awt.image.SurfaceManager;
3029
import sun.java2d.SurfaceData;
3130
import sun.java2d.SurfaceManagerFactory;
@@ -34,7 +33,6 @@
3433
import java.awt.GraphicsConfiguration;
3534
import java.awt.Graphics2D;
3635
import java.awt.Graphics;
37-
import java.awt.GraphicsEnvironment;
3836
import java.awt.Image;
3937
import java.awt.ImageCapabilities;
4038
import java.awt.image.BufferedImage;
@@ -78,28 +76,6 @@ public TextureWrapperImage(GraphicsConfiguration gc, long texture)
7876
SurfaceManager.setManager(this, surfaceManager);
7977
}
8078

81-
@JBRApi.Provides("SharedTextures")
82-
public static Image wrapTexture(GraphicsConfiguration gc, long texture) {
83-
return new TextureWrapperImage(gc, texture);
84-
}
85-
86-
@JBRApi.Provides("SharedTextures")
87-
public static int getTextureType() {
88-
GraphicsConfiguration gc = GraphicsEnvironment
89-
.getLocalGraphicsEnvironment()
90-
.getDefaultScreenDevice()
91-
.getDefaultConfiguration();
92-
try {
93-
if (isInstanceOf(gc, "sun.java2d.metal.MTLGraphicsConfig")) {
94-
return 1;
95-
}
96-
} catch (Exception e) {
97-
throw new InternalError("Unexpected exception during reflection", e);
98-
}
99-
100-
return 0;
101-
}
102-
10379
@Override
10480
public int getWidth(ImageObserver observer) {
10581
return (int) (sd.getBounds().width / sd.getDefaultScaleX());
@@ -137,13 +113,4 @@ public Object getProperty(String name, ImageObserver observer) {
137113
public ImageCapabilities getCapabilities(GraphicsConfiguration gc) {
138114
return capabilities;
139115
}
140-
141-
private static boolean isInstanceOf(Object obj, String className) {
142-
try {
143-
var clazz = Class.forName(className);
144-
return clazz.isInstance(obj);
145-
} catch (ClassNotFoundException e) {
146-
return false;
147-
}
148-
}
149116
}

0 commit comments

Comments
 (0)