From ae5bb33ab23e4da7abc5d1b29a3c155e5953a49c Mon Sep 17 00:00:00 2001
From: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
Date: Thu, 29 Jul 2021 15:58:21 +0300
Subject: [PATCH] JBR-3648 Replace CacheCellInfo usages with MTLCacheCellInfo
 in metal rendering code

(cherry picked from commit 7a94f7ea07d5265de36ea47617153ab3bc6722c5)
---
 .../macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h   | 4 ++--
 .../macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h
index 316a040ab810..a4f2befed857 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h
@@ -39,8 +39,8 @@ typedef void (MTLFlushFunc)();
 typedef struct _MTLCacheCellInfo MTLCacheCellInfo;
 
 typedef struct {
-    CacheCellInfo *head;
-    CacheCellInfo *tail;
+    MTLCacheCellInfo *head;
+    MTLCacheCellInfo *tail;
     id<MTLTexture> texture;
     jint          width;
     jint          height;
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m
index b57e384b37e9..14d36c0cd95d 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m
@@ -388,7 +388,7 @@ MTLTR_DrawLCDGlyphViaCache(MTLContext *mtlc, BMTLSDOps *dstOps,
                            GlyphInfo *ginfo, jint x, jint y,
                            jboolean rgbOrder, jint contrast)
 {
-    CacheCellInfo *cell;
+    MTLCacheCellInfo *cell;
     jfloat tx1, ty1, tx2, ty2;
     jint w = ginfo->width;
     jint h = ginfo->height;
@@ -430,7 +430,7 @@ MTLTR_DrawLCDGlyphViaCache(MTLContext *mtlc, BMTLSDOps *dstOps,
             return JNI_TRUE;
         }
     }
-    cell = (CacheCellInfo *) (ginfo->cellInfo);
+    cell = (MTLCacheCellInfo *) (ginfo->cellInfo);
     cell->timesRendered++;
 
     MTLTR_SetLCDContrast(mtlc, contrast, lcdCacheEncoder);