--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLContext.m	Wed Oct 23 12:04:35 2019 -0700
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLContext.m	Fri Nov 01 17:23:42 2019 +0300
@@ -382,40 +382,25 @@
     [self setEncoderTransform:encoder dest:dest];
 }
 
-- (id<MTLRenderCommandEncoder>) createRenderEncoderForDest:(id<MTLTexture>) dest {
-    id <MTLRenderCommandEncoder> mtlEncoder = [self createEncoderForDest: dest];
-    [self updateRenderEncoderProperties:mtlEncoder dest:dest];
-    return mtlEncoder;
-}
-
-- (id<MTLRenderCommandEncoder>)createSamplingEncoderForDest:(id<MTLTexture>)dest {
-    id <MTLRenderCommandEncoder> mtlEncoder = [self createRenderEncoderForDest:dest];
-    [mtlEncoder setRenderPipelineState:[pipelineStateStorage getTexturePipelineState:NO compositeRule:alphaCompositeRule]];
-    [self setEncoderTransform:mtlEncoder dest:dest];
-    return mtlEncoder;
-}
-
 - (id<MTLBlitCommandEncoder>)createBlitEncoder {
     return _commandBuffer == nil ? nil : [_commandBuffer blitCommandEncoder];
 }
 
 - (id<MTLRenderCommandEncoder>) createCommonRenderEncoderForDest:(id<MTLTexture>) dest {
     if (commonRenderEncoder == nil) {
-        commonRenderEncoder = [self createRenderEncoderForDest: dest];
-    } else {
-        [self updateRenderEncoderProperties:commonRenderEncoder dest:dest];
+        commonRenderEncoder = [self createEncoderForDest: dest];
     }
+    [self updateRenderEncoderProperties:commonRenderEncoder dest:dest];
     return commonRenderEncoder;
 }
 
 - (id<MTLRenderCommandEncoder>)createCommonSamplingEncoderForDest:(id<MTLTexture>)dest {
     if (commonRenderEncoder == nil) {
-        commonRenderEncoder = [self createRenderEncoderForDest: dest];
-        [self updateSamplingEncoderProperties:commonRenderEncoder dest:dest];
-    } else {
-        [self updateRenderEncoderProperties:commonRenderEncoder dest:dest];
-        [self updateSamplingEncoderProperties:commonRenderEncoder dest:dest];
+        commonRenderEncoder = [self createEncoderForDest: dest];
     }
+    [self updateRenderEncoderProperties:commonRenderEncoder dest:dest];
+    [self updateSamplingEncoderProperties:commonRenderEncoder dest:dest];
+
     return commonRenderEncoder;
 }
 

--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLUtils.m	Wed Oct 23 12:04:35 2019 -0700
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLUtils.m	Fri Nov 01 17:23:42 2019 +0300
@@ -18,12 +18,12 @@
     J2dTraceTraceVector(fpt);
     J2dTraceImpl(J2D_TRACE_VERBOSE, JNI_FALSE, "  ===>>>  ");
     J2dTraceTraceVector(fpt_trans);
-    J2dTraceLn(J2D_TRACE_VERBOSE, " ");
+    J2dTraceImpl(J2D_TRACE_VERBOSE, JNI_TRUE, " ");
 }
 
 static void traceMatrix(simd_float4x4 * mtx) {
     for (int row = 0; row < 4; ++row) {
-        J2dTraceLn4(J2D_TRACE_VERBOSE, "  [%lf %lf %lf %lf]",
+        J2dTraceImpl(J2D_TRACE_VERBOSE, JNI_FALSE, "  [%lf %lf %lf %lf]",
                     mtx->columns[0][row], mtx->columns[1][row], mtx->columns[2][row], mtx->columns[3][row]);
     }
 }
@@ -31,17 +31,17 @@
 void traceRaster(char * p, int width, int height, int stride) {
     for (int y = 0; y < height; ++y) {
         for (int x = 0; x < width; ++x) {
-            char pix0 = p[y*stride + x*4];
-            char pix1 = p[y*stride + x*4 + 1];
-            char pix2 = p[y*stride + x*4 + 2];
-            char pix3 = p[y*stride + x*4 + 3];
-            J2dTrace4(J2D_TRACE_INFO, "[%d,%d,%d,%d], ", pix0, pix1, pix2, pix3);
+            unsigned char pix0 = p[y*stride + x*4];
+            unsigned char pix1 = p[y*stride + x*4 + 1];
+            unsigned char pix2 = p[y*stride + x*4 + 2];
+            unsigned char pix3 = p[y*stride + x*4 + 3];
+            J2dTraceImpl(J2D_TRACE_INFO, JNI_FALSE,"[%u,%u,%u,%u], ", pix0, pix1, pix2, pix3);
         }
-        J2dTraceLn(J2D_TRACE_INFO, "");
+        J2dTraceImpl(J2D_TRACE_INFO, JNI_TRUE, "");
     }
 }
 
 void tracePoints(jint nPoints, jint *xPoints, jint *yPoints) {
     for (int i = 0; i < nPoints; i++)
-        J2dTraceLn2(J2D_TRACE_INFO, "\t(%d, %d)", *(xPoints++), *(yPoints++));
+        J2dTraceImpl(J2D_TRACE_INFO, JNI_TRUE, "\t(%d, %d)", *(xPoints++), *(yPoints++));
 }