DRW: Put all view-only dependant uniform in a UBO.

This leads to less lookups to the GWNShaderInterface and less uniform upload.

We still keep a legacy path so that Builtin uniforms can still work. We might restrict this path to Builtin shader only in the future.

1 files changed, 8 insertions, 5 deletions

diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 1afa0ff2402..689b19a81ff 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -246,6 +246,12 @@ struct DRWPass {
 	char name[MAX_PASS_NAME];
 };
 
+typedef struct ViewUboStorage {
+	DRWMatrixState matstate;
+	float viewcamtexcofac[4];
+	float clipplanes[2][4];
+} ViewUboStorage;
+
 /* ------------- DRAW MANAGER ------------ */
 
 #define MAX_CLIP_PLANES 6 /* GL_MAX_CLIP_PLANES is at least 6 */
@@ -304,11 +310,8 @@ typedef struct DRWManager {
 	int num_clip_planes;         /* Number of active clipplanes. */
 	bool dirty_mat;
 
-	struct {
-		DRWMatrixState matstate;
-		float viewcamtexcofac[4];
-		float clip_planes_eq[MAX_CLIP_PLANES][4];
-	} view_data;
+	/* keep in sync with viewBlock */
+	ViewUboStorage view_data;
 
 	struct {
 		float frustum_planes[6][4];