Optimize floor drawing (WIP)

[glebm]

No description provided.

[AJenbo]

Do you check to make sure that the tiles you do this for do not have content drawn on them from other ones and that they do not draw outside of the general rectangular area?

[glebm]

The floor is drawn before everything else and I think floor tiles never overlap with each other

That said, so far I haven't been able to get any performance improvement out of this so far (and I tried quite a few things).
The floor drawing gets faster but DrawDungeon, which I haven't change at all, gets slower. It's a mystery.

[AJenbo]

The floor is drawn before everything else and I think floor tiles never overlap with each other

That said, so far I haven't been able to get any performance improvement out of this so far (and I tried quite a few things). The floor drawing gets faster but DrawDungeon, which I haven't change at all, gets slower. It's a mystery.

the foliage part is for tiles that do not limit them selfs to the "tile" shape. I think for floor this is only and issue in town, for the dungeons they all appears to adhere to the shape.

I guess you can simply handle it by not applying this optimization to any where foliage is true.

[glebm]

foliage is only checked in DrawCell, which is not used for drawing floor tiles:

devilutionX/Source/engine/render/scrollrt.cpp

Line 475 in 7d5bef7

const bool foliage = !TileHasAny(tilePosition, TileProperties::Solid);

Floor tiles are always drawn without mask (MaskType::Solid), doesn't look like our code supports foliage for them:

devilutionX/Source/engine/render/scrollrt.cpp

Lines 572 to 597 in 7d5bef7

	void DrawFloorTile(const Surface &out, Point tilePosition, Point targetBufferPosition)
	{
	const int lightTableIndex = dLight[tilePosition.x][tilePosition.y];
	const uint8_t *tbl = LightTables[lightTableIndex].data();
	#ifdef _DEBUG
	if (DebugPath && MyPlayer->IsPositionInPath(tilePosition))
	tbl = GetPauseTRN();
	#endif
	const uint16_t levelPieceId = dPiece[tilePosition.x][tilePosition.y];
	{
	const LevelCelBlock levelCelBlock { DPieceMicros[levelPieceId].mt[0] };
	if (levelCelBlock.hasValue()) {
	RenderTile(out, targetBufferPosition,
	levelCelBlock, MaskType::Solid, tbl);
	}
	}
	{
	const LevelCelBlock levelCelBlock { DPieceMicros[levelPieceId].mt[1] };
	if (levelCelBlock.hasValue()) {
	RenderTile(out, targetBufferPosition + Displacement { TILE_WIDTH / 2, 0 },
	levelCelBlock, MaskType::Solid, tbl);
	}
	}
	}

[AJenbo]

😑 We might want to look in to that then

[glebm]

I think what happens is that foliage is drawn again in DrawCell, after the floor.

The condition for whether something is a floor tile is exactly the same as foliage:

!TileHasAny(tilePosition, TileProperties::Solid); 

Moreover, we only draw foliage for tiles of TransparentSquare type.

So for a transparent square tile, we first draw it fully in DrawFloor.
Then, in DrawCell, we draw only the masked part again.

I think the foliage condition is not very precise. Not all TransparentSquare tiles have foliage.
However, I don't know of a more precise way to detect whether a tile has foliage.

[AJenbo]

Thanks for investigating that.