Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-01-10 13:36:20 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-01-10 13:36:20 +0300
commit1aa962825bcf6245f9b9d2939794e8bdacd2d65d (patch)
treeac9229a544a363673fd087d44faed0557381bf3f /source/blender/draw
parent7c98c97933c596656b891d872a2b644bf573cf82 (diff)
Use same order of arguments for Texture.ensure*()
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/intern/DRW_gpu_wrapper.hh16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh
index e11c4624f9b..4433c430220 100644
--- a/source/blender/draw/intern/DRW_gpu_wrapper.hh
+++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh
@@ -464,37 +464,37 @@ class Texture : NonCopyable {
* Ensure the texture has the correct properties. Recreating it if needed.
* Return true if a texture has been created.
*/
- bool ensure_1d(eGPUTextureFormat format, int extent, int mips = 1, float *data = nullptr)
+ bool ensure_1d(eGPUTextureFormat format, int extent, float *data = nullptr, int mips = 1)
{
return ensure_impl(extent, 0, 0, mips, format, data, false, false);
}
bool ensure_1d_array(
- eGPUTextureFormat format, int extent, int layers, int mips = 1, float *data = nullptr)
+ eGPUTextureFormat format, int extent, int layers, float *data = nullptr, int mips = 1)
{
return ensure_impl(extent, layers, 0, mips, format, data, true, false);
}
- bool ensure_2d(eGPUTextureFormat format, const int2 &extent, int mips = 1, float *data = nullptr)
+ bool ensure_2d(eGPUTextureFormat format, const int2 &extent, float *data = nullptr, int mips = 1)
{
return ensure_impl(UNPACK2(extent), 0, mips, format, data, false, false);
}
bool ensure_2d_array(eGPUTextureFormat format,
const int2 &extent,
int layers,
- int mips = 1,
- float *data = nullptr)
+ float *data = nullptr,
+ int mips = 1)
{
return ensure_impl(UNPACK2(extent), layers, mips, format, data, true, false);
}
- bool ensure_3d(eGPUTextureFormat format, const int3 &extent, int mips = 1, float *data = nullptr)
+ bool ensure_3d(eGPUTextureFormat format, const int3 &extent, float *data = nullptr, int mips = 1)
{
return ensure_impl(UNPACK3(extent), mips, format, data, false, false);
}
- bool ensure_cube(eGPUTextureFormat format, int extent, int mips = 1, float *data = nullptr)
+ bool ensure_cube(eGPUTextureFormat format, int extent, float *data = nullptr, int mips = 1)
{
return ensure_impl(extent, extent, 0, mips, format, data, false, true);
}
bool ensure_cube_array(
- eGPUTextureFormat format, int extent, int layers, int mips = 1, float *data = nullptr)
+ eGPUTextureFormat format, int extent, int layers, float *data = nullptr, int mips = 1)
{
return ensure_impl(extent, extent, layers, mips, format, data, false, true);
}