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:
authorAngus Stanton <abstanton>2022-08-03 09:14:58 +0300
committerJeroen Bakker <jeroen@blender.org>2022-08-03 09:15:12 +0300
commitea70687dd5b9474ce183b7de12e42ec5201864e0 (patch)
tree241ea9199bbf110d548d0a694488c628d0c56406 /source/blender/imbuf
parentabc46d5aeb49a71ad537c86daa3d78451f63e6d3 (diff)
Image: Display GPU layout in `uiTemplateImageInfo`
Add IMB_gpu_get_texture_format and GPU_texture_format_description to retrieve and 'stringify' an eGPUTextureFormat. These are then used in the image info panel used in several areas across blender. New Information: {F13330937} Reviewed By: jbakker Maniphest Tasks: T99998 Differential Revision: https://developer.blender.org/D15575
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/IMB_imbuf.h22
-rw-r--r--source/blender/imbuf/intern/util_gpu.c10
2 files changed, 20 insertions, 12 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 20c414bb1ad..28125c006eb 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -41,6 +41,7 @@
/* for bool */
#include "../blenlib/BLI_sys_types.h"
+#include "../gpu/GPU_texture.h"
#ifdef __cplusplus
extern "C" {
@@ -74,12 +75,6 @@ struct Stereo3dFormat;
/**
*
- * \attention defined in GPU_texture.h
- */
-struct GPUTexture;
-
-/**
- *
* \attention Defined in allocimbuf.c
*/
void IMB_init(void);
@@ -933,22 +928,25 @@ const char *IMB_ffmpeg_last_error(void);
*
* \attention defined in util_gpu.c
*/
-struct GPUTexture *IMB_create_gpu_texture(const char *name,
- struct ImBuf *ibuf,
- bool use_high_bitdepth,
- bool use_premult);
+GPUTexture *IMB_create_gpu_texture(const char *name,
+ struct ImBuf *ibuf,
+ bool use_high_bitdepth,
+ bool use_premult);
+
+eGPUTextureFormat IMB_gpu_get_texture_format(const struct ImBuf *ibuf, bool high_bitdepth);
+
/**
* The `ibuf` is only here to detect the storage type. The produced texture will have undefined
* content. It will need to be populated by using #IMB_update_gpu_texture_sub().
*/
-struct GPUTexture *IMB_touch_gpu_texture(
+GPUTexture *IMB_touch_gpu_texture(
const char *name, struct ImBuf *ibuf, int w, int h, int layers, bool use_high_bitdepth);
/**
* Will update a #GPUTexture using the content of the #ImBuf. Only one layer will be updated.
* Will resize the ibuf if needed.
* Z is the layer to update. Unused if the texture is 2D.
*/
-void IMB_update_gpu_texture_sub(struct GPUTexture *tex,
+void IMB_update_gpu_texture_sub(GPUTexture *tex,
struct ImBuf *ibuf,
int x,
int y,
diff --git a/source/blender/imbuf/intern/util_gpu.c b/source/blender/imbuf/intern/util_gpu.c
index 5feb0ceb515..727704e27e8 100644
--- a/source/blender/imbuf/intern/util_gpu.c
+++ b/source/blender/imbuf/intern/util_gpu.c
@@ -290,3 +290,13 @@ GPUTexture *IMB_create_gpu_texture(const char *name,
return tex;
}
+
+eGPUTextureFormat IMB_gpu_get_texture_format(const ImBuf *ibuf, bool high_bitdepth)
+{
+ eGPUTextureFormat gpu_texture_format;
+ eGPUDataFormat gpu_data_format;
+
+ imb_gpu_get_format(ibuf, high_bitdepth, &gpu_data_format, &gpu_texture_format);
+
+ return gpu_texture_format;
+}