asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #78200 from prominentdetail/patch-3

Browse source 
Properly handle wireframe mode in RendererRD pipeline cache
This commit is contained in:
Rémi Verschelde 2023-06-14 09:27:10 +02:00
commit 16c2fede71
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/rendering/renderer_rd/pipeline_cache_rd.cpp
View file

@ -36,7 +36,7 @@ RID PipelineCacheRD::_generate_version(RD::VertexFormatID p_vertex_format_id, RD
RD::PipelineMultisampleState multisample_state_version = multisample_state; RD::PipelineMultisampleState multisample_state_version = multisample_state;
multisample_state_version.sample_count = RD::get_singleton()->framebuffer_format_get_texture_samples(p_framebuffer_format_id, p_render_pass); multisample_state_version.sample_count = RD::get_singleton()->framebuffer_format_get_texture_samples(p_framebuffer_format_id, p_render_pass);
bool wireframe = p_wireframe || rasterization_state.wireframe; bool wireframe = p_wireframe;
RD::PipelineRasterizationState raster_state_version = rasterization_state; RD::PipelineRasterizationState raster_state_version = rasterization_state;
raster_state_version.wireframe = wireframe; raster_state_version.wireframe = wireframe;

2
servers/rendering/renderer_rd/pipeline_cache_rd.h
View file

@ -76,6 +76,8 @@ public:
#endif #endif
spin_lock.lock(); spin_lock.lock();
p_wireframe |= rasterization_state.wireframe;
RID result; RID result;
for (uint32_t i = 0; i < version_count; i++) { for (uint32_t i = 0; i < version_count; i++) {
if (versions[i].vertex_id == p_vertex_format_id && versions[i].framebuffer_id == p_framebuffer_format_id && versions[i].wireframe == p_wireframe && versions[i].render_pass == p_render_pass && versions[i].bool_specializations == p_bool_specializations) { if (versions[i].vertex_id == p_vertex_format_id && versions[i].framebuffer_id == p_framebuffer_format_id && versions[i].wireframe == p_wireframe && versions[i].render_pass == p_render_pass && versions[i].bool_specializations == p_bool_specializations) {