@@ -405,18 +405,13 @@ void InternalFlutterGpu_RenderPass_BindIndexBufferDevice(
405405 length_in_bytes, index_type);
406406}
407407
408- static bool BindUniform (
408+ static bool BindUniformStruct (
409409 flutter::gpu::RenderPass* wrapper,
410410 flutter::gpu::Shader* shader,
411- Dart_Handle uniform_name_handle ,
411+ const flutter::gpu::Shader::UniformBinding* uniform_struct ,
412412 const std::shared_ptr<const impeller::DeviceBuffer>& buffer,
413413 int offset_in_bytes,
414414 int length_in_bytes) {
415- auto uniform_name = tonic::StdStringFromDart (uniform_name_handle);
416- const flutter::gpu::Shader::UniformBinding* uniform_struct =
417- shader->GetUniformStruct (uniform_name);
418- // TODO(bdero): Return an error string stating that no uniform struct with
419- // this name exists and throw an exception.
420415 if (!uniform_struct) {
421416 return false ;
422417 }
@@ -458,27 +453,35 @@ bool InternalFlutterGpu_RenderPass_BindUniformDevice(
458453 flutter::gpu::DeviceBuffer* device_buffer,
459454 int offset_in_bytes,
460455 int length_in_bytes) {
461- return BindUniform (wrapper, shader, uniform_name_handle,
462- device_buffer->GetBuffer (), offset_in_bytes,
463- length_in_bytes);
456+ auto uniform_name = tonic::StdStringFromDart (uniform_name_handle);
457+ return BindUniformStruct (
458+ wrapper, shader, shader->GetUniformStruct (uniform_name),
459+ device_buffer->GetBuffer (), offset_in_bytes, length_in_bytes);
464460}
465461
466- bool InternalFlutterGpu_RenderPass_BindTexture (
462+ bool InternalFlutterGpu_RenderPass_BindUniformDeviceIndexed (
467463 flutter::gpu::RenderPass* wrapper,
468464 flutter::gpu::Shader* shader,
469- Dart_Handle uniform_name_handle,
465+ int uniform_struct_index,
466+ flutter::gpu::DeviceBuffer* device_buffer,
467+ int offset_in_bytes,
468+ int length_in_bytes) {
469+ return BindUniformStruct (
470+ wrapper, shader, shader->GetUniformStructAt (uniform_struct_index),
471+ device_buffer->GetBuffer (), offset_in_bytes, length_in_bytes);
472+ }
473+
474+ static bool BindTextureBinding (
475+ flutter::gpu::RenderPass* wrapper,
476+ flutter::gpu::Shader* shader,
477+ const flutter::gpu::Shader::TextureBinding* texture_binding,
470478 flutter::gpu::Texture* texture,
471479 int min_filter,
472480 int mag_filter,
473481 int mip_filter,
474482 int width_address_mode,
475483 int height_address_mode,
476484 int max_anisotropy) {
477- auto uniform_name = tonic::StdStringFromDart (uniform_name_handle);
478- const flutter::gpu::Shader::TextureBinding* texture_binding =
479- shader->GetUniformTexture (uniform_name);
480- // TODO(bdero): Return an error string stating that no uniform texture with
481- // this name exists and throw an exception.
482485 if (!texture_binding) {
483486 return false ;
484487 }
@@ -520,6 +523,41 @@ bool InternalFlutterGpu_RenderPass_BindTexture(
520523 return true ;
521524}
522525
526+ bool InternalFlutterGpu_RenderPass_BindTexture (
527+ flutter::gpu::RenderPass* wrapper,
528+ flutter::gpu::Shader* shader,
529+ Dart_Handle uniform_name_handle,
530+ flutter::gpu::Texture* texture,
531+ int min_filter,
532+ int mag_filter,
533+ int mip_filter,
534+ int width_address_mode,
535+ int height_address_mode,
536+ int max_anisotropy) {
537+ auto uniform_name = tonic::StdStringFromDart (uniform_name_handle);
538+ return BindTextureBinding (
539+ wrapper, shader, shader->GetUniformTexture (uniform_name), texture,
540+ min_filter, mag_filter, mip_filter, width_address_mode,
541+ height_address_mode, max_anisotropy);
542+ }
543+
544+ bool InternalFlutterGpu_RenderPass_BindTextureIndexed (
545+ flutter::gpu::RenderPass* wrapper,
546+ flutter::gpu::Shader* shader,
547+ int uniform_texture_index,
548+ flutter::gpu::Texture* texture,
549+ int min_filter,
550+ int mag_filter,
551+ int mip_filter,
552+ int width_address_mode,
553+ int height_address_mode,
554+ int max_anisotropy) {
555+ return BindTextureBinding (
556+ wrapper, shader, shader->GetUniformTextureAt (uniform_texture_index),
557+ texture, min_filter, mag_filter, mip_filter, width_address_mode,
558+ height_address_mode, max_anisotropy);
559+ }
560+
523561void InternalFlutterGpu_RenderPass_ClearBindings (
524562 flutter::gpu::RenderPass* wrapper) {
525563 wrapper->ClearBindings ();
0 commit comments