8314401: Clear color attachment at appropriate stage

Author: jayathirthrao

modules/javafx.graphics/src/main/native-prism-mtl/MetalContext.h

@@ -157,7 +157,9 @@ typedef enum VertexInputIndex {
 - (void) setCameraPosition:(float)x
         y:(float)y z:(float)z;
 - (vector_float4) getCameraPosition;
+- (MTLScissorRect) getScissorRect;
 - (bool) isDepthEnabled;
+- (bool) isScissorEnabled;
 - (void) dealloc;
 
 @end

modules/javafx.graphics/src/main/native-prism-mtl/MetalContext.m

@@ -81,7 +81,15 @@ - (void) setRTT:(MetalRTTexture*)rttPtr
     rtt = rttPtr;
     CTX_LOG(@"-> Native: MetalContext.setRTT() %lu , %lu",
                     [rtt getTexture].width, [rtt getTexture].height);
-    rttPassDesc.colorAttachments[0].texture = [rtt getTexture];
+    if ([rttPtr isMSAAEnabled]) {
+        rttPassDesc.colorAttachments[0].storeAction = MTLStoreActionStoreAndMultisampleResolve;
+        rttPassDesc.colorAttachments[0].texture = [rtt getMSAATexture];
+        rttPassDesc.colorAttachments[0].resolveTexture = [rtt getTexture];
+    } else {
+        rttPassDesc.colorAttachments[0].storeAction = MTLStoreActionStore;
+        rttPassDesc.colorAttachments[0].texture = [rtt getTexture];
+        rttPassDesc.colorAttachments[0].resolveTexture = nil;
+    }
     [self resetClip];
 }
 
@@ -510,21 +518,9 @@ - (NSInteger) setDeviceParametersFor3D
     CTX_LOG(@"MetalContext_setDeviceParametersFor3D()");
     id<MTLCommandBuffer> commandBuffer = [self getCurrentCommandBuffer];
     phongRPD = [MTLRenderPassDescriptor new];
-    if (!rttCleared) {
-        phongRPD.colorAttachments[0].loadAction = MTLLoadActionClear;
-    }
-    if (clearDepthTexture &&
-        depthEnabled) {
-        phongRPD.depthAttachment.loadAction = MTLLoadActionClear;
-    }
-    phongRPD.colorAttachments[0].clearColor =
-        MTLClearColorMake(clearColor[0],
-                          clearColor[1],
-                          clearColor[2],
-                          clearColor[3]);
+    phongRPD.colorAttachments[0].loadAction = MTLLoadActionLoad;
 
     if ([[self getRTT] isMSAAEnabled]) {
-        phongRPD.colorAttachments[0].loadAction = MTLLoadActionClear;
         phongRPD.colorAttachments[0].storeAction = MTLStoreActionStoreAndMultisampleResolve;
         phongRPD.colorAttachments[0].texture = [rtt getMSAATexture];
         phongRPD.colorAttachments[0].resolveTexture = [rtt getTexture];
@@ -535,8 +531,12 @@ - (NSInteger) setDeviceParametersFor3D
     }
     if (depthEnabled) {
         phongRPD.depthAttachment.clearDepth = 1.0;
-        if ([[self getRTT] isMSAAEnabled]) {
+        if (clearDepthTexture) {
             phongRPD.depthAttachment.loadAction = MTLLoadActionClear;
+        } else {
+            phongRPD.depthAttachment.loadAction = MTLLoadActionLoad;
+        }
+        if ([[self getRTT] isMSAAEnabled]) {
             phongRPD.depthAttachment.storeAction = MTLStoreActionStoreAndMultisampleResolve;
             phongRPD.depthAttachment.texture = [rtt getDepthMSAATexture];
             phongRPD.depthAttachment.resolveTexture = [rtt getDepthTexture];
@@ -583,11 +583,21 @@ - (vector_float4) getCameraPosition
     return cPos;
 }
 
+- (MTLScissorRect) getScissorRect
+{
+    return scissorRect;
+}
+
 - (bool) isDepthEnabled
 {
     return depthEnabled;
 }
 
+- (bool) isScissorEnabled
+{
+    return isScissorEnabled;
+}
+
 // TODO: MTL: This was copied from GlassHelper, and could be moved to a utility class.
 + (NSString*) nsStringWithJavaString:(jstring)javaString withEnv:(JNIEnv*)env
 {

modules/javafx.graphics/src/main/native-prism-mtl/MetalMeshView.m

@@ -200,6 +200,9 @@ - (void) render
     if (wireframe) {
         [phongEncoder setTriangleFillMode:MTLTriangleFillModeLines];
     }
+    if ([context isScissorEnabled]) {
+        [phongEncoder setScissorRect:[context getScissorRect]];
+    }
     vsUniforms.mvp_matrix = [context getMVPMatrix];
     vsUniforms.world_matrix = [context getWorldMatrix];
     vsUniforms.cameraPos = [context getCameraPosition];

modules/javafx.graphics/src/main/native-prism-mtl/MetalPipelineManager.m

@@ -82,6 +82,12 @@ - (void) init:(MetalContext*) ctx  libPath:(NSString*) path
     pipeDesc.fragmentFunction = func;
     pipeDesc.colorAttachments[0].pixelFormat = MTLPixelFormatBGRA8Unorm; //rtt.pixelFormat
 
+    if ([[context getRTT] isMSAAEnabled]) {
+        pipeDesc.sampleCount = 4;
+    } else {
+        pipeDesc.sampleCount = 1;
+    }
+
     [self setPipelineCompositeBlendMode:pipeDesc];
 
     id<MTLRenderPipelineState> pipeState = [[context getDevice] newRenderPipelineStateWithDescriptor:pipeDesc error:&error];