diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-02-25 09:47:35 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-02-25 09:47:35 +0300 |
commit | ae3263e52532997a2149dfff67cec2dbcc9e465a (patch) | |
tree | a12f96a261f4ace3c25033db4dae69bc42f515d1 /source/blender/draw/intern | |
parent | 9e45468835bacca145028dafad9be33accad5bed (diff) |
DrawEngine: Clean up
Put DefaultFramebufferList and DefaultTextureList into an own header
file. These structs were private, but also used by the window manager
and gpu package. The previous implementation we needed to keep these
structs in sync.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 60c6e66bfe9..4f7554006cb 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -25,6 +25,8 @@ #ifndef __DRW_RENDER_H__ #define __DRW_RENDER_H__ +#include "DRW_engine_types.h" + #include "BLI_listbase.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" @@ -61,8 +63,6 @@ #include "DEG_depsgraph.h" -struct DefaultFramebufferList; -struct DefaultTextureList; struct GPUBatch; struct GPUFrameBuffer; struct GPUMaterial; @@ -133,25 +133,6 @@ typedef struct DrawEngineType { const struct rcti *rect); } DrawEngineType; -#ifndef __DRW_ENGINE_H__ -/* Buffer and textures used by the viewport by default */ -typedef struct DefaultFramebufferList { - struct GPUFrameBuffer *default_fb; - struct GPUFrameBuffer *overlay_fb; - struct GPUFrameBuffer *in_front_fb; - struct GPUFrameBuffer *color_only_fb; - struct GPUFrameBuffer *depth_only_fb; - struct GPUFrameBuffer *overlay_only_fb; -} DefaultFramebufferList; - -typedef struct DefaultTextureList { - struct GPUTexture *color; - struct GPUTexture *color_overlay; - struct GPUTexture *depth; - struct GPUTexture *depth_in_front; -} DefaultTextureList; -#endif - /* Textures */ typedef enum { DRW_TEX_FILTER = (1 << 0), |