From 9c327af2806500c668d42e772fd6916218083444 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 6 Dec 2024 01:14:27 +1000 Subject: [PATCH] GPUDevice: Typedef auto-recycled texture --- src/util/gpu_device.cpp | 2 +- src/util/gpu_device.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp index cdea7c07a..3ce01338c 100644 --- a/src/util/gpu_device.cpp +++ b/src/util/gpu_device.cpp @@ -1041,7 +1041,7 @@ std::unique_ptr GPUDevice::FetchTexture(u32 width, u32 height, u32 l return ret; } -std::unique_ptr +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 index 8a98cb4f5..c2b37f2fb 100644 --- a/src/util/gpu_device.h +++ b/src/util/gpu_device.h @@ -630,6 +630,7 @@ public: { void operator()(GPUTexture* const tex); }; + using AutoRecycleTexture = std::unique_ptr; static constexpr u32 MAX_TEXTURE_SAMPLERS = 8; static constexpr u32 MIN_TEXEL_BUFFER_ELEMENTS = 4 * 1024 * 512; @@ -742,10 +743,9 @@ public: std::unique_ptr 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 - 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 FetchAndUploadTextureImage(const Image& image, GPUTexture::Flags flags = GPUTexture::Flags::None, Error* error = nullptr);