diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-22 00:56:55 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-22 14:29:05 +0300 |
commit | 7b3f64e12a76897480166fe9621057ac9e484c34 (patch) | |
tree | 0d3b536cfb46d96e41878d965199188d3c959dbf /source/blender/draw/intern/draw_manager.h | |
parent | 6914f7125bcfb766ab96f3e264e608013e00ed03 (diff) |
Cleanup: DRW: Remove, rename stuffs
Diffstat (limited to 'source/blender/draw/intern/draw_manager.h')
-rw-r--r-- | source/blender/draw/intern/draw_manager.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 665cc6e2c7d..ec76f3888a8 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -215,12 +215,19 @@ struct DRWPass { }; /* keep in sync with viewBlock */ -typedef struct ViewUboStorage { - DRWMatrixState matstate; +typedef struct DRWViewUboStorage { + /* View matrices */ + float persmat[4][4]; + float persinv[4][4]; + float viewmat[4][4]; + float viewinv[4][4]; + float winmat[4][4]; + float wininv[4][4]; + float clipplanes[6][4]; /* Should not be here. Not view dependant (only main view). */ float viewcamtexcofac[4]; -} ViewUboStorage; +} DRWViewUboStorage; #define MAX_CULLED_VIEWS 32 @@ -228,7 +235,7 @@ struct DRWView { /** Parent view if this is a sub view. NULL otherwise. */ struct DRWView *parent; - ViewUboStorage storage; + DRWViewUboStorage storage; /** Number of active clipplanes. */ int clip_planes_len; /** Does culling result needs to be updated. */ @@ -327,7 +334,7 @@ typedef struct DRWManager { uint primary_view_ct; /** TODO(fclem) Remove this. Only here to support * shaders without common_view_lib.glsl */ - ViewUboStorage view_storage_cpy; + DRWViewUboStorage view_storage_cpy; #ifdef USE_GPU_SELECT uint select_id; |