From d7d0f0277c437004ed476393542da39c84c5cf9f Mon Sep 17 00:00:00 2001
From: tcmal <me@aria.rip>
Date: Sun, 25 Aug 2024 17:44:22 +0100
Subject: chore(render): update hal and fix some errors

---
 stockton-render/src/draw/texture/block.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'stockton-render/src/draw/texture/block.rs')

diff --git a/stockton-render/src/draw/texture/block.rs b/stockton-render/src/draw/texture/block.rs
index 7735f5c..5ac3a94 100644
--- a/stockton-render/src/draw/texture/block.rs
+++ b/stockton-render/src/draw/texture/block.rs
@@ -2,7 +2,6 @@ use super::{loader::BlockRef, repo::BLOCK_SIZE};
 use crate::types::*;
 
 use arrayvec::ArrayVec;
-use hal::prelude::*;
 use rendy_memory::{Allocator, Block};
 use std::{iter::once, mem::ManuallyDrop};
 
@@ -15,7 +14,7 @@ pub struct TexturesBlock<B: Block<back::Backend>> {
 impl<B: Block<back::Backend>> TexturesBlock<B> {
     pub fn deactivate<T: Allocator<back::Backend, Block = B>>(
         mut self,
-        device: &mut Device,
+        device: &mut DeviceT,
         tex_alloc: &mut T,
         desc_alloc: &mut DescriptorAllocator,
     ) {
@@ -36,9 +35,9 @@ impl<B: Block<back::Backend>> TexturesBlock<B> {
 
 pub struct LoadedImage<B: Block<back::Backend>> {
     pub mem: ManuallyDrop<B>,
-    pub img: ManuallyDrop<Image>,
-    pub img_view: ManuallyDrop<ImageView>,
-    pub sampler: ManuallyDrop<Sampler>,
+    pub img: ManuallyDrop<ImageT>,
+    pub img_view: ManuallyDrop<ImageViewT>,
+    pub sampler: ManuallyDrop<SamplerT>,
     pub row_size: usize,
     pub height: u32,
     pub width: u32,
@@ -47,7 +46,7 @@ pub struct LoadedImage<B: Block<back::Backend>> {
 impl<B: Block<back::Backend>> LoadedImage<B> {
     pub fn deactivate<T: Allocator<back::Backend, Block = B>>(
         self,
-        device: &mut Device,
+        device: &mut DeviceT,
         alloc: &mut T,
     ) {
         unsafe {
-- 
cgit v1.2.3