summaryrefslogtreecommitdiff
path: root/engine/src/rendering/backend/opengl.rs
diff options
context:
space:
mode:
Diffstat (limited to 'engine/src/rendering/backend/opengl.rs')
-rw-r--r--engine/src/rendering/backend/opengl.rs22
1 files changed, 6 insertions, 16 deletions
diff --git a/engine/src/rendering/backend/opengl.rs b/engine/src/rendering/backend/opengl.rs
index 0fbfb37..95aef27 100644
--- a/engine/src/rendering/backend/opengl.rs
+++ b/engine/src/rendering/backend/opengl.rs
@@ -709,15 +709,10 @@ fn handle_commands(
tracing::error!("Failed to create texture object: {err}");
}
}
- Command::UpdateTexture { obj_id, texture, offset } => {
- if let Err(err) = update_texture_object(
- gl_context,
- object_store,
- assets,
- obj_id,
- texture,
- offset,
- ) {
+ Command::UpdateTexture { obj_id, image, offset } => {
+ if let Err(err) =
+ update_texture_object(gl_context, object_store, obj_id, image, offset)
+ {
tracing::error!("Failed to update texture object: {err}");
}
}
@@ -1174,16 +1169,11 @@ fn create_texture_object(
fn update_texture_object(
curr_gl_ctx: &MaybeCurrentContextWithFns,
object_store: &mut ObjectStore,
- assets: &Assets,
texture_object_id: ObjectId,
- texture: AssetOrValue<Texture>,
+ texture_image: Image,
offset: Vec2<u32>,
) -> Result<(), GlTextureError>
{
- let Some((texture_image, _)) = retrieve_texture(assets, &texture) else {
- return Ok(());
- };
-
let Some(texture_obj) = object_store.get_obj(&texture_object_id) else {
tracing::error!(
texture_object_id=?texture_object_id,
@@ -1207,7 +1197,7 @@ fn update_texture_object(
0,
offset.into(),
texture_image.dimensions().into(),
- get_image_pixel_data_format(&*texture_image),
+ get_image_pixel_data_format(&texture_image),
texture_image.as_bytes(),
)?;