diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-29 16:50:46 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-29 16:54:51 +0300 |
commit | 2d89cd7dd5b2345ca5cc36cb20edacb04ef90036 (patch) | |
tree | 2a0f47059f83383ce7a55a32984c14708cf77d4a /source/blender/gpu/GPU_texture.h | |
parent | 99d0b3b79377d38d3936fd9beba8d647e938f0c1 (diff) |
Cleanup: GPU: Move Image based function to GPU_draw.h
This makes it less confusing what functions are for blender
structures.
Diffstat (limited to 'source/blender/gpu/GPU_texture.h')
-rw-r--r-- | source/blender/gpu/GPU_texture.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 42afe2b63bf..31b8e6c9b6a 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -25,6 +25,7 @@ #define __GPU_TEXTURE_H__ #include "BLI_utildefines.h" + #include "GPU_state.h" struct GPUVertBuf; @@ -38,14 +39,6 @@ struct PreviewImage; struct GPUFrameBuffer; typedef struct GPUTexture GPUTexture; -/* Used to get the correct gpu texture from an Image datablock. */ -typedef enum eGPUTextureTarget { - TEXTARGET_2D = 0, - TEXTARGET_2D_ARRAY, - TEXTARGET_TILE_MAPPING, - TEXTARGET_COUNT, -} eGPUTextureTarget; - /* GPU Samplers state * - Specify the sampler state to bind a texture with. * - Internally used by textures. @@ -237,21 +230,9 @@ GPUTexture *GPU_texture_create_cube_array( GPUTexture *GPU_texture_create_from_vertbuf(struct GPUVertBuf *vert); GPUTexture *GPU_texture_create_buffer(eGPUTextureFormat data_type, const uint buffer); -GPUTexture *GPU_texture_create_error(eGPUTextureTarget target); GPUTexture *GPU_texture_create_compressed( int w, int h, int miplen, eGPUTextureFormat format, const void *data); -GPUTexture *GPU_texture_from_blender(struct Image *ima, - struct ImageUser *iuser, - struct ImBuf *ibuf, - eGPUTextureTarget target); - -/* movie clip drawing */ -GPUTexture *GPU_texture_from_movieclip(struct MovieClip *clip, - struct MovieClipUser *cuser, - eGPUTextureTarget target); -void GPU_free_texture_movieclip(struct MovieClip *clip); - void GPU_texture_add_mipmap(GPUTexture *tex, eGPUDataFormat gpu_data_format, int miplvl, |