GPUDevice: Typedef auto-recycled texture

stenzek · Dec 6, 2024 · 9c327af · 9c327af
1 parent 52feb1a
commit 9c327af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp
@@ -1041,7 +1041,7 @@ std::unique_ptr<GPUTexture> GPUDevice::FetchTexture(u32 width, u32 height, u32 l
   return ret;
 }
 
-std::unique_ptr<GPUTexture, GPUDevice::PooledTextureDeleter>
+GPUDevice::AutoRecycleTexture
 GPUDevice::FetchAutoRecycleTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples, GPUTexture::Type type,
                                    GPUTexture::Format format, GPUTexture::Flags flags, const void* data /* = nullptr */,
                                    u32 data_stride /* = 0 */, Error* error /* = nullptr */)

diff --git a/src/util/gpu_device.h b/src/util/gpu_device.h
@@ -630,6 +630,7 @@ class GPUDevice
   {
     void operator()(GPUTexture* const tex);
   };
+  using AutoRecycleTexture = std::unique_ptr<GPUTexture, PooledTextureDeleter>;
 
   static constexpr u32 MAX_TEXTURE_SAMPLERS = 8;
   static constexpr u32 MIN_TEXEL_BUFFER_ELEMENTS = 4 * 1024 * 512;
@@ -742,10 +743,9 @@ class GPUDevice
   std::unique_ptr<GPUTexture> FetchTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples,
                                            GPUTexture::Type type, GPUTexture::Format format, GPUTexture::Flags flags,
                                            const void* data = nullptr, u32 data_stride = 0, Error* error = nullptr);
-  std::unique_ptr<GPUTexture, PooledTextureDeleter>
-  FetchAutoRecycleTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples, GPUTexture::Type type,
-                          GPUTexture::Format format, GPUTexture::Flags flags, const void* data = nullptr,
-                          u32 data_stride = 0, Error* error = nullptr);
+  AutoRecycleTexture FetchAutoRecycleTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples,
+                                             GPUTexture::Type type, GPUTexture::Format format, GPUTexture::Flags flags,
+                                             const void* data = nullptr, u32 data_stride = 0, Error* error = nullptr);
   std::unique_ptr<GPUTexture> FetchAndUploadTextureImage(const Image& image,
                                                          GPUTexture::Flags flags = GPUTexture::Flags::None,
                                                          Error* error = nullptr);