Browse Source

Fixes to recent Vulkan errors

clayjohn 4 years ago
parent
commit
775e3db2e1

+ 2 - 2
servers/rendering/renderer_rd/renderer_scene_render_forward.cpp

@@ -2500,7 +2500,7 @@ RID RendererSceneRenderForward::_setup_render_pass_uniform_set(RID p_render_buff
 		RD::Uniform u;
 		RD::Uniform u;
 		u.binding = 4;
 		u.binding = 4;
 		u.uniform_type = RD::UNIFORM_TYPE_TEXTURE;
 		u.uniform_type = RD::UNIFORM_TYPE_TEXTURE;
-		RID texture = false && rb && rb->depth.is_valid() ? rb->depth : storage->texture_rd_get_default(RendererStorageRD::DEFAULT_RD_TEXTURE_WHITE);
+		RID texture = rb && rb->depth.is_valid() ? rb->depth : storage->texture_rd_get_default(RendererStorageRD::DEFAULT_RD_TEXTURE_WHITE);
 		u.ids.push_back(texture);
 		u.ids.push_back(texture);
 		uniforms.push_back(u);
 		uniforms.push_back(u);
 	}
 	}
@@ -2578,7 +2578,7 @@ RID RendererSceneRenderForward::_setup_render_pass_uniform_set(RID p_render_buff
 			RD::Uniform u;
 			RD::Uniform u;
 			u.binding = 12;
 			u.binding = 12;
 			u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
 			u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
-			u.ids.push_back(rb ? render_buffers_get_default_gi_probe_buffer() : render_buffers_get_gi_probe_buffer(p_render_buffers));
+			u.ids.push_back(rb ? render_buffers_get_gi_probe_buffer(p_render_buffers) : render_buffers_get_default_gi_probe_buffer());
 			uniforms.push_back(u);
 			uniforms.push_back(u);
 		}
 		}
 		{
 		{

+ 1 - 1
servers/rendering/renderer_rd/shaders/sdfgi_fields.glsl

@@ -14,7 +14,7 @@ layout(local_size_x = OCT_RES, local_size_y = OCT_RES, local_size_z = 1) in;
 layout(rgba16f, set = 0, binding = 1) uniform restrict image2DArray irradiance_texture;
 layout(rgba16f, set = 0, binding = 1) uniform restrict image2DArray irradiance_texture;
 layout(rg16f, set = 0, binding = 2) uniform restrict image2DArray depth_texture;
 layout(rg16f, set = 0, binding = 2) uniform restrict image2DArray depth_texture;
 
 
-ayout(rgba32ui, set = 0, binding = 3) uniform restrict uimage2DArray irradiance_history_texture;
+layout(rgba32ui, set = 0, binding = 3) uniform restrict uimage2DArray irradiance_history_texture;
 layout(rg32ui, set = 0, binding = 4) uniform restrict uimage2DArray depth_history_texture;
 layout(rg32ui, set = 0, binding = 4) uniform restrict uimage2DArray depth_history_texture;
 
 
 struct CascadeData {
 struct CascadeData {