godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #103645 from stuartcarnie/fix_101696_pt_2

Browse Source 
Metal: Use `p_set_index` when binding uniforms, to use correct data
This commit is contained in:
Thaddeus Crews
2025-03-06 16:36:12 -06:00
parent 10b1bc5363 a4fb68f43e
commit ec5e096388
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/metal/metal_objects.h
View File

@@ -800,7 +800,7 @@ public:
void bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index); void bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index);
void bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index); void bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index);
BoundUniformSet &bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage); BoundUniformSet &bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage, uint32_t p_set_index);
}; };
class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDPipeline { class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDPipeline {

8
drivers/metal/metal_objects.mm
View File

@@ -1063,7 +1063,7 @@ void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandB
id<MTLRenderCommandEncoder> __unsafe_unretained enc = p_state.encoder; id<MTLRenderCommandEncoder> __unsafe_unretained enc = p_state.encoder;
id<MTLDevice> __unsafe_unretained device = enc.device; id<MTLDevice> __unsafe_unretained device = enc.device;
BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage); BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage, p_set_index);
// Set the buffer for the vertex stage. // Set the buffer for the vertex stage.
{ {
@@ -1275,7 +1275,7 @@ void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandB
id<MTLComputeCommandEncoder> enc = p_state.encoder; id<MTLComputeCommandEncoder> enc = p_state.encoder;
id<MTLDevice> device = enc.device; id<MTLDevice> device = enc.device;
BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage); BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage, p_set_index);
uint32_t const *offset = set_info.offsets.getptr(RDD::SHADER_STAGE_COMPUTE); uint32_t const *offset = set_info.offsets.getptr(RDD::SHADER_STAGE_COMPUTE);
if (offset) { if (offset) {
@@ -1417,14 +1417,14 @@ void MDUniformSet::bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeSta
} }
} }
BoundUniformSet &MDUniformSet::bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage) { BoundUniformSet &MDUniformSet::bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage, uint32_t p_set_index) {
BoundUniformSet *sus = bound_uniforms.getptr(p_shader); BoundUniformSet *sus = bound_uniforms.getptr(p_shader);
if (sus != nullptr) { if (sus != nullptr) {
sus->merge_into(p_resource_usage); sus->merge_into(p_resource_usage);
return *sus; return *sus;
} }
UniformSet const &set = p_shader->sets[index]; UniformSet const &set = p_shader->sets[p_set_index];
HashMap<id<MTLResource>, StageResourceUsage> bound_resources; HashMap<id<MTLResource>, StageResourceUsage> bound_resources;
auto add_usage = [&bound_resources](id<MTLResource> __unsafe_unretained res, RDD::ShaderStage stage, MTLResourceUsage usage) { auto add_usage = [&bound_resources](id<MTLResource> __unsafe_unretained res, RDD::ShaderStage stage, MTLResourceUsage usage) {