--- a/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java Wed Jul 05 23:27:00 2017 +0200
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/marlin/MarlinTileGenerator.java Wed May 17 22:05:11 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,51 @@
package sun.java2d.marlin;
+import java.util.Arrays;
import sun.java2d.pipe.AATileGenerator;
import jdk.internal.misc.Unsafe;
final class MarlinTileGenerator implements AATileGenerator, MarlinConst {
- private static final int MAX_TILE_ALPHA_SUM = TILE_SIZE * TILE_SIZE
- * MAX_AA_ALPHA;
+ private static final int MAX_TILE_ALPHA_SUM = TILE_W * TILE_H * MAX_AA_ALPHA;
+
+ private static final int TH_AA_ALPHA_FILL_EMPTY = ((MAX_AA_ALPHA + 1) / 3); // 33%
+ private static final int TH_AA_ALPHA_FILL_FULL = ((MAX_AA_ALPHA + 1) * 2 / 3); // 66%
+
+ private static final int FILL_TILE_W = TILE_W >> 1; // half tile width
- private final Renderer rdr;
+ static {
+ if (MAX_TILE_ALPHA_SUM <= 0) {
+ throw new IllegalStateException("Invalid MAX_TILE_ALPHA_SUM: " + MAX_TILE_ALPHA_SUM);
+ }
+ if (DO_TRACE) {
+ System.out.println("MAX_AA_ALPHA : " + MAX_AA_ALPHA);
+ System.out.println("TH_AA_ALPHA_FILL_EMPTY : " + TH_AA_ALPHA_FILL_EMPTY);
+ System.out.println("TH_AA_ALPHA_FILL_FULL : " + TH_AA_ALPHA_FILL_FULL);
+ System.out.println("FILL_TILE_W : " + FILL_TILE_W);
+ }
+ }
+
+ private final Renderer rdrF;
+ private final DRenderer rdrD;
private final MarlinCache cache;
private int x, y;
- // per-thread renderer context
- final RendererContext rdrCtx;
+ // per-thread renderer stats
+ final RendererStats rdrStats;
- MarlinTileGenerator(Renderer r) {
- this.rdr = r;
- this.cache = r.cache;
- this.rdrCtx = r.rdrCtx;
+ MarlinTileGenerator(final RendererStats stats, final MarlinRenderer r,
+ final MarlinCache cache)
+ {
+ this.rdrStats = stats;
+ if (r instanceof Renderer) {
+ this.rdrF = (Renderer)r;
+ this.rdrD = null;
+ } else {
+ this.rdrF = null;
+ this.rdrD = (DRenderer)r;
+ }
+ this.cache = cache;
}
MarlinTileGenerator init() {
@@ -61,14 +87,17 @@
public void dispose() {
if (DO_MONITORS) {
// called from AAShapePipe.renderTiles() (render tiles end):
- rdrCtx.stats.mon_pipe_renderTiles.stop();
+ rdrStats.mon_pipe_renderTiles.stop();
}
// dispose cache:
cache.dispose();
- // dispose renderer:
- rdr.dispose();
- // recycle the RendererContext instance
- MarlinRenderingEngine.returnRendererContext(rdrCtx);
+ // dispose renderer and recycle the RendererContext instance:
+ // bimorphic call optimization:
+ if (rdrF != null) {
+ rdrF.dispose();
+ } else if (rdrD != null) {
+ rdrD.dispose();
+ }
}
void getBbox(int[] bbox) {
@@ -86,9 +115,9 @@
public int getTileWidth() {
if (DO_MONITORS) {
// called from AAShapePipe.renderTiles() (render tiles start):
- rdrCtx.stats.mon_pipe_renderTiles.start();
+ rdrStats.mon_pipe_renderTiles.start();
}
- return TILE_SIZE;
+ return TILE_W;
}
/**
@@ -97,7 +126,7 @@
*/
@Override
public int getTileHeight() {
- return TILE_SIZE;
+ return TILE_H;
}
/**
@@ -131,7 +160,7 @@
final int alpha = (al == 0x00 ? 0x00
: (al == MAX_TILE_ALPHA_SUM ? 0xff : 0x80));
if (DO_STATS) {
- rdrCtx.stats.hist_tile_generator_alpha.add(alpha);
+ rdrStats.hist_tile_generator_alpha.add(alpha);
}
return alpha;
}
@@ -143,14 +172,19 @@
*/
@Override
public void nextTile() {
- if ((x += TILE_SIZE) >= cache.bboxX1) {
+ if ((x += TILE_W) >= cache.bboxX1) {
x = cache.bboxX0;
- y += TILE_SIZE;
+ y += TILE_H;
if (y < cache.bboxY1) {
// compute for the tile line
// [ y; max(y + TILE_SIZE, bboxY1) ]
- this.rdr.endRendering(y);
+ // bimorphic call optimization:
+ if (rdrF != null) {
+ rdrF.endRendering(y);
+ } else if (rdrD != null) {
+ rdrD.endRendering(y);
+ }
}
}
}
@@ -180,7 +214,7 @@
final int rowstride)
{
if (DO_MONITORS) {
- rdrCtx.stats.mon_ptg_getAlpha.start();
+ rdrStats.mon_ptg_getAlpha.start();
}
// local vars for performance:
@@ -190,11 +224,11 @@
final int[] rowAAx1 = _cache.rowAAx1;
final int x0 = this.x;
- final int x1 = FloatMath.min(x0 + TILE_SIZE, _cache.bboxX1);
+ final int x1 = FloatMath.min(x0 + TILE_W, _cache.bboxX1);
// note: process tile line [0 - 32[
final int y0 = 0;
- final int y1 = FloatMath.min(this.y + TILE_SIZE, _cache.bboxY1) - this.y;
+ final int y1 = FloatMath.min(this.y + TILE_H, _cache.bboxY1) - this.y;
if (DO_LOG_BOUNDS) {
MarlinUtils.logInfo("getAlpha = [" + x0 + " ... " + x1
@@ -237,14 +271,14 @@
}
}
- // now: cx >= x0 but cx < aax0 (x1 < aax0)
+ // now: cx >= x0 and cx >= aax0
// Copy AA data (sum alpha data):
addr = addr_rowAA + rowAAChunkIndex[cy] + (cx - aax0);
for (end = (aax1 <= x1) ? aax1 : x1; cx < end; cx++) {
// cx inside tile[x0; x1[ :
- tile[idx++] = _unsafe.getByte(addr); // [0..255]
+ tile[idx++] = _unsafe.getByte(addr); // [0-255]
addr += SIZE;
}
}
@@ -269,7 +303,7 @@
nextTile();
if (DO_MONITORS) {
- rdrCtx.stats.mon_ptg_getAlpha.stop();
+ rdrStats.mon_ptg_getAlpha.stop();
}
}
@@ -282,7 +316,7 @@
final int rowstride)
{
if (DO_MONITORS) {
- rdrCtx.stats.mon_ptg_getAlpha.start();
+ rdrStats.mon_ptg_getAlpha.start();
}
// Decode run-length encoded alpha mask data
@@ -300,24 +334,48 @@
final long[] rowAAPos = _cache.rowAAPos;
final int x0 = this.x;
- final int x1 = FloatMath.min(x0 + TILE_SIZE, _cache.bboxX1);
+ final int x1 = FloatMath.min(x0 + TILE_W, _cache.bboxX1);
+ final int w = x1 - x0;
// note: process tile line [0 - 32[
final int y0 = 0;
- final int y1 = FloatMath.min(this.y + TILE_SIZE, _cache.bboxY1) - this.y;
+ final int y1 = FloatMath.min(this.y + TILE_H, _cache.bboxY1) - this.y;
if (DO_LOG_BOUNDS) {
MarlinUtils.logInfo("getAlpha = [" + x0 + " ... " + x1
+ "[ [" + y0 + " ... " + y1 + "[");
}
+ // avoid too small area: fill is not faster !
+ final int clearTile;
+ final byte refVal;
+ final int area;
+
+ if ((w >= FILL_TILE_W) && (area = w * y1) > 64) { // 64 / 4 ie 16 words min (faster)
+ final int alphaSum = cache.alphaSumInTile(x0);
+
+ if (alphaSum < area * TH_AA_ALPHA_FILL_EMPTY) {
+ clearTile = 1;
+ refVal = 0;
+ } else if (alphaSum > area * TH_AA_ALPHA_FILL_FULL) {
+ clearTile = 2;
+ refVal = (byte)0xff;
+ } else {
+ clearTile = 0;
+ refVal = 0;
+ }
+ } else {
+ clearTile = 0;
+ refVal = 0;
+ }
+
final Unsafe _unsafe = OffHeapArray.UNSAFE;
final long SIZE_BYTE = 1L;
final long SIZE_INT = 4L;
final long addr_rowAA = _cache.rowAAChunk.address;
long addr, addr_row, last_addr, addr_end;
- final int skipRowPixels = (rowstride - (x1 - x0));
+ final int skipRowPixels = (rowstride - w);
int cx, cy, cx1;
int rx0, rx1, runLen, end;
@@ -325,137 +383,414 @@
byte val;
int idx = offset;
- for (cy = y0; cy < y1; cy++) {
- // empty line (default)
- cx = x0;
+ switch (clearTile) {
+ case 1: // 0x00
+ // Clear full tile rows:
+ Arrays.fill(tile, offset, offset + (y1 * rowstride), refVal);
+
+ for (cy = y0; cy < y1; cy++) {
+ // empty line (default)
+ cx = x0;
+
+ if (rowAAEnc[cy] == 0) {
+ // Raw encoding:
+
+ final int aax1 = rowAAx1[cy]; // exclusive
+
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (aax1 > x0) {
+ final int aax0 = rowAAx0[cy]; // inclusive
+
+ if (aax0 < x1) {
+ // note: cx is the cursor pointer in the tile array
+ // (left to right)
+ cx = aax0;
- if (rowAAEnc[cy] == 0) {
- // Raw encoding:
+ // ensure cx >= x0
+ if (cx <= x0) {
+ cx = x0;
+ } else {
+ // skip line start until first AA pixel rowAA exclusive:
+ idx += (cx - x0); // > 0
+ }
+
+ // now: cx >= x0 and cx >= aax0
+
+ // Copy AA data (sum alpha data):
+ addr = addr_rowAA + rowAAChunkIndex[cy] + (cx - aax0);
- final int aax1 = rowAAx1[cy]; // exclusive
+ for (end = (aax1 <= x1) ? aax1 : x1; cx < end; cx++) {
+ tile[idx++] = _unsafe.getByte(addr); // [0-255]
+ addr += SIZE_BYTE;
+ }
+ }
+ }
+ } else {
+ // RLE encoding:
+
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (rowAAx1[cy] > x0) { // last pixel exclusive
- // quick check if there is AA data
- // corresponding to this tile [x0; x1[
- if (aax1 > x0) {
- final int aax0 = rowAAx0[cy]; // inclusive
+ cx = rowAAx0[cy]; // inclusive
+ if (cx > x1) {
+ cx = x1;
+ }
+
+ // skip line start until first AA pixel rowAA exclusive:
+ if (cx > x0) {
+ idx += (cx - x0); // > 0
+ }
+
+ // get row address:
+ addr_row = addr_rowAA + rowAAChunkIndex[cy];
+ // get row end address:
+ addr_end = addr_row + rowAALen[cy]; // coded length
+
+ // reuse previous iteration position:
+ addr = addr_row + rowAAPos[cy];
+
+ last_addr = 0L;
+
+ while ((cx < x1) && (addr < addr_end)) {
+ // keep current position:
+ last_addr = addr;
+
+ // packed value:
+ packed = _unsafe.getInt(addr);
- if (aax0 < x1) {
- // note: cx is the cursor pointer in the tile array
- // (left to right)
- cx = aax0;
+ // last exclusive pixel x-coordinate:
+ cx1 = (packed >> 8);
+ // as bytes:
+ addr += SIZE_INT;
- // ensure cx >= x0
- if (cx <= x0) {
- cx = x0;
- } else {
- // fill line start until first AA pixel rowAA exclusive:
- for (end = x0; end < cx; end++) {
- tile[idx++] = 0;
+ rx0 = cx;
+ if (rx0 < x0) {
+ rx0 = x0;
+ }
+ rx1 = cx = cx1;
+ if (rx1 > x1) {
+ rx1 = x1;
+ cx = x1; // fix last x
+ }
+ // adjust runLen:
+ runLen = rx1 - rx0;
+
+ // ensure rx1 > rx0:
+ if (runLen > 0) {
+ packed &= 0xFF; // [0-255]
+
+ if (packed == 0)
+ {
+ idx += runLen;
+ continue;
+ }
+ val = (byte) packed; // [0-255]
+ do {
+ tile[idx++] = val;
+ } while (--runLen > 0);
}
}
- // now: cx >= x0 but cx < aax0 (x1 < aax0)
-
- // Copy AA data (sum alpha data):
- addr = addr_rowAA + rowAAChunkIndex[cy] + (cx - aax0);
-
- for (end = (aax1 <= x1) ? aax1 : x1; cx < end; cx++) {
- tile[idx++] = _unsafe.getByte(addr); // [0..255]
- addr += SIZE_BYTE;
+ // Update last position in RLE entries:
+ if (last_addr != 0L) {
+ // Fix x0:
+ rowAAx0[cy] = cx; // inclusive
+ // Fix position:
+ rowAAPos[cy] = (last_addr - addr_row);
}
}
}
- } else {
- // RLE encoding:
+
+ // skip line end
+ if (cx < x1) {
+ idx += (x1 - cx); // > 0
+ }
+
+ if (DO_TRACE) {
+ for (int i = idx - (x1 - x0); i < idx; i++) {
+ System.out.print(hex(tile[i], 2));
+ }
+ System.out.println();
+ }
- // quick check if there is AA data
- // corresponding to this tile [x0; x1[
- if (rowAAx1[cy] > x0) { // last pixel exclusive
+ idx += skipRowPixels;
+ }
+ break;
- cx = rowAAx0[cy]; // inclusive
- if (cx > x1) {
- cx = x1;
- }
+ case 0:
+ default:
+ for (cy = y0; cy < y1; cy++) {
+ // empty line (default)
+ cx = x0;
+
+ if (rowAAEnc[cy] == 0) {
+ // Raw encoding:
+
+ final int aax1 = rowAAx1[cy]; // exclusive
- // fill line start until first AA pixel rowAA exclusive:
- for (int i = x0; i < cx; i++) {
- tile[idx++] = 0;
- }
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (aax1 > x0) {
+ final int aax0 = rowAAx0[cy]; // inclusive
+
+ if (aax0 < x1) {
+ // note: cx is the cursor pointer in the tile array
+ // (left to right)
+ cx = aax0;
- // get row address:
- addr_row = addr_rowAA + rowAAChunkIndex[cy];
- // get row end address:
- addr_end = addr_row + rowAALen[cy]; // coded length
+ // ensure cx >= x0
+ if (cx <= x0) {
+ cx = x0;
+ } else {
+ for (end = x0; end < cx; end++) {
+ tile[idx++] = 0;
+ }
+ }
+
+ // now: cx >= x0 and cx >= aax0
- // reuse previous iteration position:
- addr = addr_row + rowAAPos[cy];
+ // Copy AA data (sum alpha data):
+ addr = addr_rowAA + rowAAChunkIndex[cy] + (cx - aax0);
- last_addr = 0L;
+ for (end = (aax1 <= x1) ? aax1 : x1; cx < end; cx++) {
+ tile[idx++] = _unsafe.getByte(addr); // [0-255]
+ addr += SIZE_BYTE;
+ }
+ }
+ }
+ } else {
+ // RLE encoding:
- while ((cx < x1) && (addr < addr_end)) {
- // keep current position:
- last_addr = addr;
-
- // packed value:
- packed = _unsafe.getInt(addr);
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (rowAAx1[cy] > x0) { // last pixel exclusive
- // last exclusive pixel x-coordinate:
- cx1 = (packed >> 8);
- // as bytes:
- addr += SIZE_INT;
+ cx = rowAAx0[cy]; // inclusive
+ if (cx > x1) {
+ cx = x1;
+ }
- rx0 = cx;
- if (rx0 < x0) {
- rx0 = x0;
+ // fill line start until first AA pixel rowAA exclusive:
+ for (end = x0; end < cx; end++) {
+ tile[idx++] = 0;
}
- rx1 = cx = cx1;
- if (rx1 > x1) {
- rx1 = x1;
- cx = x1; // fix last x
- }
- // adjust runLen:
- runLen = rx1 - rx0;
+
+ // get row address:
+ addr_row = addr_rowAA + rowAAChunkIndex[cy];
+ // get row end address:
+ addr_end = addr_row + rowAALen[cy]; // coded length
+
+ // reuse previous iteration position:
+ addr = addr_row + rowAAPos[cy];
+
+ last_addr = 0L;
+
+ while ((cx < x1) && (addr < addr_end)) {
+ // keep current position:
+ last_addr = addr;
+
+ // packed value:
+ packed = _unsafe.getInt(addr);
+
+ // last exclusive pixel x-coordinate:
+ cx1 = (packed >> 8);
+ // as bytes:
+ addr += SIZE_INT;
- // ensure rx1 > rx0:
- if (runLen > 0) {
- val = (byte)(packed & 0xFF); // [0..255]
+ rx0 = cx;
+ if (rx0 < x0) {
+ rx0 = x0;
+ }
+ rx1 = cx = cx1;
+ if (rx1 > x1) {
+ rx1 = x1;
+ cx = x1; // fix last x
+ }
+ // adjust runLen:
+ runLen = rx1 - rx0;
- do {
- tile[idx++] = val;
- } while (--runLen > 0);
+ // ensure rx1 > rx0:
+ if (runLen > 0) {
+ packed &= 0xFF; // [0-255]
+
+ val = (byte) packed; // [0-255]
+ do {
+ tile[idx++] = val;
+ } while (--runLen > 0);
+ }
+ }
+
+ // Update last position in RLE entries:
+ if (last_addr != 0L) {
+ // Fix x0:
+ rowAAx0[cy] = cx; // inclusive
+ // Fix position:
+ rowAAPos[cy] = (last_addr - addr_row);
}
}
+ }
- // Update last position in RLE entries:
- if (last_addr != 0L) {
- // Fix x0:
- rowAAx0[cy] = cx; // inclusive
- // Fix position:
- rowAAPos[cy] = (last_addr - addr_row);
+ // fill line end
+ while (cx < x1) {
+ tile[idx++] = 0;
+ cx++;
+ }
+
+ if (DO_TRACE) {
+ for (int i = idx - (x1 - x0); i < idx; i++) {
+ System.out.print(hex(tile[i], 2));
+ }
+ System.out.println();
+ }
+
+ idx += skipRowPixels;
+ }
+ break;
+
+ case 2: // 0xFF
+ // Fill full tile rows:
+ Arrays.fill(tile, offset, offset + (y1 * rowstride), refVal);
+
+ for (cy = y0; cy < y1; cy++) {
+ // empty line (default)
+ cx = x0;
+
+ if (rowAAEnc[cy] == 0) {
+ // Raw encoding:
+
+ final int aax1 = rowAAx1[cy]; // exclusive
+
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (aax1 > x0) {
+ final int aax0 = rowAAx0[cy]; // inclusive
+
+ if (aax0 < x1) {
+ // note: cx is the cursor pointer in the tile array
+ // (left to right)
+ cx = aax0;
+
+ // ensure cx >= x0
+ if (cx <= x0) {
+ cx = x0;
+ } else {
+ // fill line start until first AA pixel rowAA exclusive:
+ for (end = x0; end < cx; end++) {
+ tile[idx++] = 0;
+ }
+ }
+
+ // now: cx >= x0 and cx >= aax0
+
+ // Copy AA data (sum alpha data):
+ addr = addr_rowAA + rowAAChunkIndex[cy] + (cx - aax0);
+
+ for (end = (aax1 <= x1) ? aax1 : x1; cx < end; cx++) {
+ tile[idx++] = _unsafe.getByte(addr); // [0-255]
+ addr += SIZE_BYTE;
+ }
+ }
+ }
+ } else {
+ // RLE encoding:
+
+ // quick check if there is AA data
+ // corresponding to this tile [x0; x1[
+ if (rowAAx1[cy] > x0) { // last pixel exclusive
+
+ cx = rowAAx0[cy]; // inclusive
+ if (cx > x1) {
+ cx = x1;
+ }
+
+ // fill line start until first AA pixel rowAA exclusive:
+ for (end = x0; end < cx; end++) {
+ tile[idx++] = 0;
+ }
+
+ // get row address:
+ addr_row = addr_rowAA + rowAAChunkIndex[cy];
+ // get row end address:
+ addr_end = addr_row + rowAALen[cy]; // coded length
+
+ // reuse previous iteration position:
+ addr = addr_row + rowAAPos[cy];
+
+ last_addr = 0L;
+
+ while ((cx < x1) && (addr < addr_end)) {
+ // keep current position:
+ last_addr = addr;
+
+ // packed value:
+ packed = _unsafe.getInt(addr);
+
+ // last exclusive pixel x-coordinate:
+ cx1 = (packed >> 8);
+ // as bytes:
+ addr += SIZE_INT;
+
+ rx0 = cx;
+ if (rx0 < x0) {
+ rx0 = x0;
+ }
+ rx1 = cx = cx1;
+ if (rx1 > x1) {
+ rx1 = x1;
+ cx = x1; // fix last x
+ }
+ // adjust runLen:
+ runLen = rx1 - rx0;
+
+ // ensure rx1 > rx0:
+ if (runLen > 0) {
+ packed &= 0xFF; // [0-255]
+
+ if (packed == 0xFF)
+ {
+ idx += runLen;
+ continue;
+ }
+ val = (byte) packed; // [0-255]
+ do {
+ tile[idx++] = val;
+ } while (--runLen > 0);
+ }
+ }
+
+ // Update last position in RLE entries:
+ if (last_addr != 0L) {
+ // Fix x0:
+ rowAAx0[cy] = cx; // inclusive
+ // Fix position:
+ rowAAPos[cy] = (last_addr - addr_row);
+ }
}
}
- }
- // fill line end
- while (cx < x1) {
- tile[idx++] = 0;
- cx++;
- }
+ // fill line end
+ while (cx < x1) {
+ tile[idx++] = 0;
+ cx++;
+ }
- if (DO_TRACE) {
- for (int i = idx - (x1 - x0); i < idx; i++) {
- System.out.print(hex(tile[i], 2));
+ if (DO_TRACE) {
+ for (int i = idx - (x1 - x0); i < idx; i++) {
+ System.out.print(hex(tile[i], 2));
+ }
+ System.out.println();
}
- System.out.println();
+
+ idx += skipRowPixels;
}
-
- idx += skipRowPixels;
}
nextTile();
if (DO_MONITORS) {
- rdrCtx.stats.mon_ptg_getAlpha.stop();
+ rdrStats.mon_ptg_getAlpha.stop();
}
}