Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit

Permalink
JDK-8241156: Lanai: JPEG Image does not render
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Ushakov committed Mar 20, 2020
1 parent 4a9a170 commit db88ce1
Showing 1 changed file with 54 additions and 48 deletions.
102 changes: 54 additions & 48 deletions src/java.desktop/macosx/classes/sun/java2d/metal/MTLBlitLoops.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,21 @@ static void register() {
MTLSurfaceData.PF_INT_BGR),
new MTLSwToSurfaceBlit(SurfaceType.IntBgrx,
MTLSurfaceData.PF_INT_BGRX),
new MTLSwToSurfaceBlit(SurfaceType.ThreeByteBgr,
MTLSurfaceData.PF_3BYTE_BGR),
new MTLSwToSurfaceBlit(SurfaceType.Ushort565Rgb,
MTLSurfaceData.PF_USHORT_565_RGB),
new MTLSwToSurfaceBlit(SurfaceType.Ushort555Rgb,
MTLSurfaceData.PF_USHORT_555_RGB),
new MTLSwToSurfaceBlit(SurfaceType.Ushort555Rgbx,
MTLSurfaceData.PF_USHORT_555_RGBX),
new MTLSwToSurfaceBlit(SurfaceType.ByteGray,
MTLSurfaceData.PF_BYTE_GRAY),
new MTLSwToSurfaceBlit(SurfaceType.UshortGray,
MTLSurfaceData.PF_USHORT_GRAY),
// TODO: Provide native implementation
// It may not be effective/possible. For example, there is no direct
// support in Metal for SurfaceType.ThreeByteBgr
// new MTLSwToSurfaceBlit(SurfaceType.ThreeByteBgr,
// MTLSurfaceData.PF_3BYTE_BGR),
// new MTLSwToSurfaceBlit(SurfaceType.Ushort565Rgb,
// MTLSurfaceData.PF_USHORT_565_RGB),
// new MTLSwToSurfaceBlit(SurfaceType.Ushort555Rgb,
// MTLSurfaceData.PF_USHORT_555_RGB),
// new MTLSwToSurfaceBlit(SurfaceType.Ushort555Rgbx,
// MTLSurfaceData.PF_USHORT_555_RGBX),
// new MTLSwToSurfaceBlit(SurfaceType.ByteGray,
// MTLSurfaceData.PF_BYTE_GRAY),
// new MTLSwToSurfaceBlit(SurfaceType.UshortGray,
// MTLSurfaceData.PF_USHORT_GRAY),
new MTLGeneralBlit(MTLSurfaceData.MTLSurface,
CompositeType.AnyAlpha,
blitIntArgbPreToSurface),
Expand All @@ -118,18 +121,19 @@ static void register() {
MTLSurfaceData.PF_INT_BGR),
new MTLSwToSurfaceScale(SurfaceType.IntBgrx,
MTLSurfaceData.PF_INT_BGRX),
new MTLSwToSurfaceScale(SurfaceType.ThreeByteBgr,
MTLSurfaceData.PF_3BYTE_BGR),
new MTLSwToSurfaceScale(SurfaceType.Ushort565Rgb,
MTLSurfaceData.PF_USHORT_565_RGB),
new MTLSwToSurfaceScale(SurfaceType.Ushort555Rgb,
MTLSurfaceData.PF_USHORT_555_RGB),
new MTLSwToSurfaceScale(SurfaceType.Ushort555Rgbx,
MTLSurfaceData.PF_USHORT_555_RGBX),
new MTLSwToSurfaceScale(SurfaceType.ByteGray,
MTLSurfaceData.PF_BYTE_GRAY),
new MTLSwToSurfaceScale(SurfaceType.UshortGray,
MTLSurfaceData.PF_USHORT_GRAY),
// TODO: Provide native implementation
// new MTLSwToSurfaceScale(SurfaceType.ThreeByteBgr,
// MTLSurfaceData.PF_3BYTE_BGR),
// new MTLSwToSurfaceScale(SurfaceType.Ushort565Rgb,
// MTLSurfaceData.PF_USHORT_565_RGB),
// new MTLSwToSurfaceScale(SurfaceType.Ushort555Rgb,
// MTLSurfaceData.PF_USHORT_555_RGB),
// new MTLSwToSurfaceScale(SurfaceType.Ushort555Rgbx,
// MTLSurfaceData.PF_USHORT_555_RGBX),
// new MTLSwToSurfaceScale(SurfaceType.ByteGray,
// MTLSurfaceData.PF_BYTE_GRAY),
// new MTLSwToSurfaceScale(SurfaceType.UshortGray,
// MTLSurfaceData.PF_USHORT_GRAY),
new MTLSwToSurfaceScale(SurfaceType.IntArgbPre,
MTLSurfaceData.PF_INT_ARGB_PRE),

Expand All @@ -141,18 +145,19 @@ static void register() {
MTLSurfaceData.PF_INT_BGR),
new MTLSwToSurfaceTransform(SurfaceType.IntBgrx,
MTLSurfaceData.PF_INT_BGRX),
new MTLSwToSurfaceTransform(SurfaceType.ThreeByteBgr,
MTLSurfaceData.PF_3BYTE_BGR),
new MTLSwToSurfaceTransform(SurfaceType.Ushort565Rgb,
MTLSurfaceData.PF_USHORT_565_RGB),
new MTLSwToSurfaceTransform(SurfaceType.Ushort555Rgb,
MTLSurfaceData.PF_USHORT_555_RGB),
new MTLSwToSurfaceTransform(SurfaceType.Ushort555Rgbx,
MTLSurfaceData.PF_USHORT_555_RGBX),
new MTLSwToSurfaceTransform(SurfaceType.ByteGray,
MTLSurfaceData.PF_BYTE_GRAY),
new MTLSwToSurfaceTransform(SurfaceType.UshortGray,
MTLSurfaceData.PF_USHORT_GRAY),
// TODO: Provide native implementation
// new MTLSwToSurfaceTransform(SurfaceType.ThreeByteBgr,
// MTLSurfaceData.PF_3BYTE_BGR),
// new MTLSwToSurfaceTransform(SurfaceType.Ushort565Rgb,
// MTLSurfaceData.PF_USHORT_565_RGB),
// new MTLSwToSurfaceTransform(SurfaceType.Ushort555Rgb,
// MTLSurfaceData.PF_USHORT_555_RGB),
// new MTLSwToSurfaceTransform(SurfaceType.Ushort555Rgbx,
// MTLSurfaceData.PF_USHORT_555_RGBX),
// new MTLSwToSurfaceTransform(SurfaceType.ByteGray,
// MTLSurfaceData.PF_BYTE_GRAY),
// new MTLSwToSurfaceTransform(SurfaceType.UshortGray,
// MTLSurfaceData.PF_USHORT_GRAY),
transformBlitIntArgbPreToSurface,

new MTLGeneralTransformedBlit(transformBlitIntArgbPreToSurface),
Expand All @@ -172,18 +177,19 @@ static void register() {
MTLSurfaceData.PF_INT_BGR),
new MTLSwToTextureBlit(SurfaceType.IntBgrx,
MTLSurfaceData.PF_INT_BGRX),
new MTLSwToTextureBlit(SurfaceType.ThreeByteBgr,
MTLSurfaceData.PF_3BYTE_BGR),
new MTLSwToTextureBlit(SurfaceType.Ushort565Rgb,
MTLSurfaceData.PF_USHORT_565_RGB),
new MTLSwToTextureBlit(SurfaceType.Ushort555Rgb,
MTLSurfaceData.PF_USHORT_555_RGB),
new MTLSwToTextureBlit(SurfaceType.Ushort555Rgbx,
MTLSurfaceData.PF_USHORT_555_RGBX),
new MTLSwToTextureBlit(SurfaceType.ByteGray,
MTLSurfaceData.PF_BYTE_GRAY),
new MTLSwToTextureBlit(SurfaceType.UshortGray,
MTLSurfaceData.PF_USHORT_GRAY),
// TODO: Provide native implementation
// new MTLSwToTextureBlit(SurfaceType.ThreeByteBgr,
// MTLSurfaceData.PF_3BYTE_BGR),
// new MTLSwToTextureBlit(SurfaceType.Ushort565Rgb,
// MTLSurfaceData.PF_USHORT_565_RGB),
// new MTLSwToTextureBlit(SurfaceType.Ushort555Rgb,
// MTLSurfaceData.PF_USHORT_555_RGB),
// new MTLSwToTextureBlit(SurfaceType.Ushort555Rgbx,
// MTLSurfaceData.PF_USHORT_555_RGBX),
// new MTLSwToTextureBlit(SurfaceType.ByteGray,
// MTLSurfaceData.PF_BYTE_GRAY),
// new MTLSwToTextureBlit(SurfaceType.UshortGray,
// MTLSurfaceData.PF_USHORT_GRAY),
new MTLGeneralBlit(MTLSurfaceData.MTLTexture,
CompositeType.SrcNoEa,
blitIntArgbPreToTexture),
Expand Down

0 comments on commit db88ce1

Please sign in to comment.