Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Impeller] OpenGLES: Ensure frag/vert textures are bound with unique texture units. #47218

Merged
merged 1 commit into from
Nov 1, 2023
Merged

[Impeller] OpenGLES: Ensure frag/vert textures are bound with unique texture units. #47218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 18 additions & 12 deletions impeller/renderer/backend/gles/buffer_bindings_gles.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,15 @@ bool BufferBindingsGLES::BindUniformData(const ProcTableGLES& gl,
}
}

if (!BindTextures(gl, vertex_bindings, ShaderStage::kVertex)) {
std::optional<size_t> next_unit_index =
BindTextures(gl, vertex_bindings, ShaderStage::kVertex);
if (!next_unit_index.has_value()) {
return false;
}

if (!BindTextures(gl, fragment_bindings, ShaderStage::kFragment)) {
if (!BindTextures(gl, fragment_bindings, ShaderStage::kFragment,
*next_unit_index)
.has_value()) {
return false;
}

Expand Down Expand Up @@ -334,20 +338,22 @@ bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
return true;
}

bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
const Bindings& bindings,
ShaderStage stage) {
size_t active_index = 0;
std::optional<size_t> BufferBindingsGLES::BindTextures(
const ProcTableGLES& gl,
const Bindings& bindings,
ShaderStage stage,
size_t unit_start_index) {
size_t active_index = unit_start_index;
for (const auto& data : bindings.sampled_images) {
const auto& texture_gles = TextureGLES::Cast(*data.second.texture.resource);
if (data.second.texture.GetMetadata() == nullptr) {
VALIDATION_LOG << "No metadata found for texture binding.";
return false;
return std::nullopt;
}

auto location = ComputeTextureLocation(data.second.texture.GetMetadata());
if (location == -1) {
return false;
return std::nullopt;
}

//--------------------------------------------------------------------------
Expand All @@ -356,15 +362,15 @@ bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
if (active_index >= gl.GetCapabilities()->GetMaxTextureUnits(stage)) {
VALIDATION_LOG << "Texture units specified exceed the capabilities for "
"this shader stage.";
return false;
return std::nullopt;
}
gl.ActiveTexture(GL_TEXTURE0 + active_index);

//--------------------------------------------------------------------------
/// Bind the texture.
///
if (!texture_gles.Bind()) {
return false;
return std::nullopt;
}

//--------------------------------------------------------------------------
Expand All @@ -373,7 +379,7 @@ bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
///
const auto& sampler_gles = SamplerGLES::Cast(*data.second.sampler.resource);
if (!sampler_gles.ConfigureBoundTexture(texture_gles, gl)) {
return false;
return std::nullopt;
}

//--------------------------------------------------------------------------
Expand All @@ -386,7 +392,7 @@ bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
///
active_index++;
}
return true;
return active_index;
}

} // namespace impeller
7 changes: 4 additions & 3 deletions impeller/renderer/backend/gles/buffer_bindings_gles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ class BufferBindingsGLES {
Allocator& transients_allocator,
const BufferResource& buffer);

bool BindTextures(const ProcTableGLES& gl,
const Bindings& bindings,
ShaderStage stage);
std::optional<size_t> BindTextures(const ProcTableGLES& gl,
const Bindings& bindings,
ShaderStage stage,
size_t unit_start_index = 0);

BufferBindingsGLES(const BufferBindingsGLES&) = delete;

Expand Down