godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Batching - prevent CPU transform for non-rects using large FVF 

Large FVF which encodes the transform in a vertex attribute is triggered by reading from VERTEX in a custom shader. This means that the local vertex position must be available in the shader, so the only way to batch is to also pass the transform as an attribute.

The large FVF path already disabled CPU transform in the case of rects, but not in other primitives, which this PR fixes.

Note that large FVF is incompatible with 2d software skinning. So reading from VERTEX in a custom shader when using skinning will not work.
This commit is contained in:
lawnjelly 2021-03-17 11:36:40 +00:00
parent dae319355f
commit 0d80385687
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -1310,7 +1310,9 @@ PREAMBLE(bool)::_prefill_line(RasterizerCanvas::Item::CommandLine *p_line, FillS
Vector2 from = p_line->from; Vector2 from = p_line->from;
Vector2 to = p_line->to; Vector2 to = p_line->to;
if (r_fill_state.transform_mode != TM_NONE) { const bool use_large_verts = bdata.use_large_verts;
if ((r_fill_state.transform_mode != TM_NONE) && (!use_large_verts)) {
_software_transform_vertex(from, r_fill_state.transform_combined); _software_transform_vertex(from, r_fill_state.transform_combined);
_software_transform_vertex(to, r_fill_state.transform_combined); _software_transform_vertex(to, r_fill_state.transform_combined);
} }
@ -1658,13 +1660,15 @@ bool C_PREAMBLE::_prefill_polygon(RasterizerCanvas::Item::CommandPolygon *p_poly
if (!_software_skin_poly(p_poly, p_item, bvs, vertex_colors, r_fill_state, precalced_colors)) { if (!_software_skin_poly(p_poly, p_item, bvs, vertex_colors, r_fill_state, precalced_colors)) {
bool software_transform = (r_fill_state.transform_mode != TM_NONE) && (!use_large_verts);
for (int n = 0; n < num_inds; n++) { for (int n = 0; n < num_inds; n++) {
int ind = p_poly->indices[n]; int ind = p_poly->indices[n];
RAST_DEV_DEBUG_ASSERT(ind < p_poly->points.size()); RAST_DEV_DEBUG_ASSERT(ind < p_poly->points.size());
// this could be moved outside the loop // this could be moved outside the loop
if (r_fill_state.transform_mode != TM_NONE) { if (software_transform) {
Vector2 pos = p_poly->points[ind]; Vector2 pos = p_poly->points[ind];
_software_transform_vertex(pos, r_fill_state.transform_combined); _software_transform_vertex(pos, r_fill_state.transform_combined);
bvs[n].pos.set(pos.x, pos.y); bvs[n].pos.set(pos.x, pos.y);