8298217: Regressions 30-110% in SwingMark on MacOS, more so on aarch64

Reviewed-by: avu, prr, jdv

Author: aghaisas

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.h

@@ -51,11 +51,6 @@ enum {
   MTL_OP_SYNC,
   MTL_OP_SHAPE_CLIP_SPANS,
   MTL_OP_MASK_OP,
-  MTL_OP_FILL_PARALLELOGRAM,
-  MTL_OP_FILL_RECT,
-  MTL_OP_DRAW_LINE,
-  MTL_OP_DRAW_RECT,
-  MTL_OP_DRAW_PARALLELOGRAM,
   MTL_OP_OTHER
 };
 /*

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m

@@ -48,35 +48,13 @@
 
 extern void MTLGC_DestroyMTLGraphicsConfig(jlong pConfigInfo);
 
-bool isDrawOp (jint op) {
-     switch(op) {
-        case MTL_OP_DRAW_LINE:
-        case MTL_OP_DRAW_RECT:
-        case MTL_OP_DRAW_PARALLELOGRAM:
-        case MTL_OP_FILL_RECT:
-        case MTL_OP_FILL_PARALLELOGRAM:
-             return true;
-        default: return false;
-     }
-}
-
 void MTLRenderQueue_CheckPreviousOp(jint op) {
 
     if (mtlPreviousOp == op) {
         // The op is the same as last time, so we can return immediately.
         return;
     }
 
-    if (isDrawOp(mtlPreviousOp)) {
-        // submit the vertex batch
-        MTLRenderer_SubmitVertexBatch(mtlc, dstOps);
-        if (isDrawOp(op)) {
-            // Do not cause endEncoder if we continue with Draw operations
-            mtlPreviousOp = op;
-            return;
-        }
-    }
-
     if (op == MTL_OP_SET_COLOR) {
         if (mtlPreviousOp != MTL_OP_MASK_OP) {
             return; // SET_COLOR should not cause endEncoder
@@ -150,7 +128,7 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                 // draw ops
                 case sun_java2d_pipe_BufferedOpCodes_DRAW_LINE:
                 {
-                    CHECK_PREVIOUS_OP(MTL_OP_DRAW_LINE);
+                    CHECK_PREVIOUS_OP(MTL_OP_OTHER);
 
                     if ([mtlc useXORComposite]) {
                         commitEncodedCommands();
@@ -166,10 +144,9 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                 }
                 case sun_java2d_pipe_BufferedOpCodes_DRAW_RECT:
                 {
-                    CHECK_PREVIOUS_OP(MTL_OP_DRAW_RECT);
+                    CHECK_PREVIOUS_OP(MTL_OP_OTHER);
 
                     if ([mtlc useXORComposite]) {
-
                         commitEncodedCommands();
                         J2dTraceLn(J2D_TRACE_VERBOSE,
                                    "DRAW_RECT in XOR mode - Force commit earlier draw calls before DRAW_RECT.");
@@ -251,7 +228,7 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                 }
                 case sun_java2d_pipe_BufferedOpCodes_DRAW_PARALLELOGRAM:
                 {
-                    CHECK_PREVIOUS_OP(MTL_OP_DRAW_PARALLELOGRAM);
+                    CHECK_PREVIOUS_OP(MTL_OP_OTHER);
 
                     if ([mtlc useXORComposite]) {
                         commitEncodedCommands();
@@ -299,7 +276,7 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                 // fill ops
                 case sun_java2d_pipe_BufferedOpCodes_FILL_RECT:
                 {
-                    CHECK_PREVIOUS_OP(MTL_OP_FILL_RECT);
+                    CHECK_PREVIOUS_OP(MTL_OP_OTHER);
 
                     if ([mtlc useXORComposite]) {
                         commitEncodedCommands();
@@ -331,7 +308,7 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                 }
                 case sun_java2d_pipe_BufferedOpCodes_FILL_PARALLELOGRAM:
                 {
-                    CHECK_PREVIOUS_OP(MTL_OP_FILL_PARALLELOGRAM);
+                    CHECK_PREVIOUS_OP(MTL_OP_OTHER);
 
                     if ([mtlc useXORComposite]) {
                         commitEncodedCommands();
@@ -605,7 +582,6 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
                     jlong pDst = NEXT_LONG(b);
 
                     if (mtlc != NULL) {
-                        MTLRenderer_SubmitVertexBatch(mtlc, dstOps);
                         [mtlc.encoderManager endEncoder];
                         MTLCommandBufferWrapper * cbwrapper = [mtlc pullCommandBufferWrapper];
                         id<MTLCommandBuffer> commandbuf = [cbwrapper getCommandBuffer];
@@ -633,7 +609,6 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
 
                         } else {
                             if (mtlc != NULL) {
-                                MTLRenderer_SubmitVertexBatch(mtlc, dstOps);
                                 [mtlc.encoderManager endEncoder];
                                 MTLCommandBufferWrapper * cbwrapper = [mtlc pullCommandBufferWrapper];
                                 id<MTLCommandBuffer> commandbuf = [cbwrapper getCommandBuffer];
@@ -903,8 +878,6 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
             if (mtlPreviousOp == MTL_OP_MASK_OP) {
                 MTLVertexCache_DisableMaskCache(mtlc);
             }
-            MTLRenderer_SubmitVertexBatch(mtlc, dstOps);
-
             [mtlc.encoderManager endEncoder];
             MTLCommandBufferWrapper * cbwrapper = [mtlc pullCommandBufferWrapper];
             id<MTLCommandBuffer> commandbuf = [cbwrapper getCommandBuffer];
@@ -950,9 +923,6 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
  * these would be rendered to the back-buffer - which is read in shader while rendering in XOR mode
  */
 void commitEncodedCommands() {
-
-    MTLRenderer_SubmitVertexBatch(mtlc, dstOps);
-
     [mtlc.encoderManager endEncoder];
 
     MTLCommandBufferWrapper *cbwrapper = [mtlc pullCommandBufferWrapper];

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.h

@@ -72,9 +72,5 @@ void MTLRenderer_FillAAParallelogram(MTLContext *mtlc, BMTLSDOps * dstOps,
                                    jfloat fx11, jfloat fy11,
                                    jfloat dx21, jfloat dy21,
                                    jfloat dx12, jfloat dy12);
-void MTLRenderer_AddVertexToBatch(float x, float y);
-void MTLRenderer_SubmitVertexBatch(MTLContext* mtlc, BMTLSDOps* dstOps);
-void MTLRenderer_SetPrimitiveType(MTLPrimitiveType type);
-
 
 #endif /* MTLRenderer_h_Included */