8255149: Lanai: DrawImage/IncorrectAlphaConversionBicubic.java failure

openjdk · Oct 21, 2020 · fbc066e · fbc066e
1 parent e47e233
commit fbc066e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/common.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/common.h
@@ -102,6 +102,7 @@ struct TxtFrameUniforms {
     vector_float4 color;
     int mode; // NOTE: consider to use bit fields
     int isSrcOpaque;
+    int isSrcPremult;
     int isDstOpaque;
     float extraAlpha;
 };

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/shaders.metal b/src/java.desktop/macosx/native/libawt_lwawt/awt/shaders.metal
@@ -177,6 +177,10 @@ fragment half4 frag_txt(
         return half4(c.r, c.g, c.b , c.a);
     }
 
+    if (uniforms.isSrcPremult) {
+        pixelColor.rgb /= srcA;
+    }
+
     return half4(pixelColor.r,
                  pixelColor.g,
                  pixelColor.b, srcA)*uniforms.extraAlpha;

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m
@@ -858,7 +858,9 @@ static void setTxtUniforms(
         id<MTLRenderCommandEncoder> encoder, int color, int mode, int interpolation, bool repeat, jfloat extraAlpha,
         const SurfaceRasterFlags * srcFlags, const SurfaceRasterFlags * dstFlags
 ) {
-    struct TxtFrameUniforms uf = {RGBA_TO_V4(color), mode, srcFlags->isOpaque, dstFlags->isOpaque, extraAlpha};
+    struct TxtFrameUniforms uf = {
+      RGBA_TO_V4(color), mode, srcFlags->isOpaque, srcFlags->isPremultiplied,
+      dstFlags->isOpaque, extraAlpha};
     [encoder setFragmentBytes:&uf length:sizeof(uf) atIndex:FrameUniformBuffer];
 
     setSampler(encoder, interpolation, repeat);