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

Remove repeat from forward mobile renderer

This commit is contained in:
Bastiaan Olij 2021-05-04 11:28:09 +10:00
parent dad77eed5c
commit cc45ed448b
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
View File

@ -1272,42 +1272,12 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
rl->element_info.resize(p_offset + element_total); rl->element_info.resize(p_offset + element_total);
uint32_t repeats = 0;
GeometryInstanceSurfaceDataCache *prev_surface = nullptr;
for (uint32_t i = 0; i < element_total; i++) { for (uint32_t i = 0; i < element_total; i++) {
GeometryInstanceSurfaceDataCache *surface = rl->elements[i + p_offset]; GeometryInstanceSurfaceDataCache *surface = rl->elements[i + p_offset];
GeometryInstanceForwardMobile *inst = surface->owner;
bool cant_repeat = inst->flags_cache & INSTANCE_DATA_FLAG_MULTIMESH || inst->mesh_instance.is_valid();
if (prev_surface != nullptr && !cant_repeat && prev_surface->sort.sort_key1 == surface->sort.sort_key1 && prev_surface->sort.sort_key2 == surface->sort.sort_key2) {
//this element is the same as the previous one, count repeats to draw it using instancing
repeats++;
} else {
if (repeats > 0) {
for (uint32_t j = 1; j <= repeats; j++) {
rl->element_info[p_offset + i - j].repeat = j;
}
}
repeats = 1;
}
RenderElementInfo &element_info = rl->element_info[p_offset + i]; RenderElementInfo &element_info = rl->element_info[p_offset + i];
element_info.lod_index = surface->lod_index; element_info.lod_index = surface->lod_index;
element_info.uses_lightmap = surface->sort.uses_lightmap; element_info.uses_lightmap = surface->sort.uses_lightmap;
if (cant_repeat) {
prev_surface = nullptr;
} else {
prev_surface = surface;
}
}
if (repeats > 0) {
for (uint32_t j = 1; j <= repeats; j++) {
rl->element_info[p_offset + element_total - j].repeat = j;
}
} }
} }
@ -1523,13 +1493,12 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
RD::get_singleton()->draw_list_set_push_constant(draw_list, &push_constant, sizeof(GeometryInstanceForwardMobile::PushConstant)); RD::get_singleton()->draw_list_set_push_constant(draw_list, &push_constant, sizeof(GeometryInstanceForwardMobile::PushConstant));
uint32_t instance_count = surf->owner->instance_count > 1 ? surf->owner->instance_count : element_info.repeat; uint32_t instance_count = surf->owner->instance_count > 1 ? surf->owner->instance_count : 1;
if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_PARTICLE_TRAILS) { if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_PARTICLE_TRAILS) {
instance_count /= surf->owner->trail_steps; instance_count /= surf->owner->trail_steps;
} }
RD::get_singleton()->draw_list_draw(draw_list, index_array_rd.is_valid(), instance_count); RD::get_singleton()->draw_list_draw(draw_list, index_array_rd.is_valid(), instance_count);
i += element_info.repeat - 1; //skip equal elements
} }
} }
@ -1872,7 +1841,7 @@ void RenderForwardMobile::_geometry_instance_add_surface_with_material(GeometryI
sdcache->sort.material_id_low = p_material_id & 0x0000FFFF; sdcache->sort.material_id_low = p_material_id & 0x0000FFFF;
sdcache->sort.material_id_hi = p_material_id >> 16; sdcache->sort.material_id_hi = p_material_id >> 16;
sdcache->sort.shader_id = p_shader_id; sdcache->sort.shader_id = p_shader_id;
sdcache->sort.geometry_id = p_mesh.get_local_index(); //only meshes can repeat anyway sdcache->sort.geometry_id = p_mesh.get_local_index();
// sdcache->sort.uses_forward_gi = ginstance->can_sdfgi; // sdcache->sort.uses_forward_gi = ginstance->can_sdfgi;
sdcache->sort.priority = p_material->priority; sdcache->sort.priority = p_material->priority;
} }

3
servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
View File

@ -363,10 +363,9 @@ protected:
}; };
struct RenderElementInfo { struct RenderElementInfo {
uint32_t repeat : 22;
uint32_t uses_lightmap : 1; uint32_t uses_lightmap : 1;
uint32_t lod_index : 8; uint32_t lod_index : 8;
uint32_t reserved : 1; // was uses_forward_gi but we don't use that here uint32_t reserved : 23;
}; };
template <PassMode p_pass_mode> template <PassMode p_pass_mode>