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:
authorCampbell Barton <ideasman42@gmail.com>2020-08-05 09:48:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-08-05 09:48:14 +0300
commitbaf015be31bb15bb57513bb7d05b1b71b67b22da (patch)
tree9b4f310cd3a72ecda185b372a394f37473cfd879 /source/blender/gpu/intern
parent05fbbfec0b0a19f1f7abe97048faa9959e6efd05 (diff)
parentde947c5c507e747b715877f9193efe146752ca87 (diff)
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/gpu/intern')
-rw-r--r--source/blender/gpu/intern/gpu_texture.cc36
1 files changed, 20 insertions, 16 deletions
diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc
index 014f82f83de..e64984a3b9e 100644
--- a/source/blender/gpu/intern/gpu_texture.cc
+++ b/source/blender/gpu/intern/gpu_texture.cc
@@ -866,14 +866,16 @@ GPUTexture *GPU_texture_create_nD(int w,
&rescaled_pixels);
if (G.debug & G_DEBUG_GPU || !valid) {
- printf("GPUTexture: create : %s, %s, w : %d, h : %d, d : %d, comp : %d, size : %.2f MiB\n",
- gl_enum_to_str(tex->target),
- gl_enum_to_str(internalformat),
- w,
- h,
- d,
- tex->components,
- gpu_texture_memory_footprint_compute(tex) / 1048576.0f);
+ printf(
+ "GPUTexture: create : %s,\t w : %5d, h : %5d, d : %5d, comp : %4d, size : %.2f "
+ "MiB,\t %s\n",
+ gl_enum_to_str(tex->target),
+ w,
+ h,
+ d,
+ tex->components,
+ gpu_texture_memory_footprint_compute(tex) / 1048576.0f,
+ gl_enum_to_str(internalformat));
}
if (!valid) {
@@ -995,14 +997,16 @@ GPUTexture *GPU_texture_cube_create(int w,
}
if (G.debug & G_DEBUG_GPU) {
- printf("GPUTexture: create : %s, %s, w : %d, h : %d, d : %d, comp : %d, size : %.2f MiB\n",
- gl_enum_to_str(tex->target),
- gl_enum_to_str(internalformat),
- w,
- w,
- d,
- tex->components,
- gpu_texture_memory_footprint_compute(tex) / 1048576.0f);
+ printf(
+ "GPUTexture: create : %s,\t w : %5d, h : %5d, d : %5d, comp : %4d, size : %.2f "
+ "MiB,\t %s\n",
+ gl_enum_to_str(tex->target),
+ w,
+ w,
+ d * 6,
+ tex->components,
+ gpu_texture_memory_footprint_compute(tex) / 1048576.0f,
+ gl_enum_to_str(internalformat));
}
gpu_texture_memory_footprint_add(tex);