Overlay: Use global viewport size instead of DRWView one

This is part of the effor to simplify the View struct in order to implement
multiview rendering.

4 files changed, 1 insertions, 150 deletions

diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h
index e49b37b451f..c6e8539121f 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -279,8 +279,6 @@ struct GPUVertBuf *DRW_mesh_batch_cache_pos_vertbuf_get(struct Mesh *me);
 
 int DRW_mesh_material_count_get(const struct Object *object, const struct Mesh *me);
 
-/* See 'common_globals_lib.glsl' for duplicate defines. */
-
 /* Edit mesh bitflags (is this the right place?) */
 enum {
   VFLAG_VERT_ACTIVE = 1 << 0,
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 73a93a10582..a63c26f70f2 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -180,7 +180,6 @@ void DRW_globals_update(void)
 
   gb->pixel_fac = *DRW_viewport_pixelsize_get();
 
-  /* Deprecated, use drw_view.viewport_size instead */
   copy_v2_v2(&gb->size_viewport[0], DRW_viewport_size_get());
   copy_v2_v2(&gb->size_viewport[2], &gb->size_viewport[0]);
   invert_v2(&gb->size_viewport[2]);
diff --git a/source/blender/draw/intern/draw_common_shader_shared.h b/source/blender/draw/intern/draw_common_shader_shared.h
index 8d412fadd82..9a5fce52c1e 100644
--- a/source/blender/draw/intern/draw_common_shader_shared.h
+++ b/source/blender/draw/intern/draw_common_shader_shared.h
@@ -228,6 +228,7 @@ BLI_STATIC_ASSERT_ALIGN(GlobalsUboStorage, 16)
 #  define colorFaceFront globalsBlock.color_face_front
 #  define colorUVShadow globalsBlock.color_uv_shadow
 #  define sizeViewport globalsBlock.size_viewport.xy
+#  define sizeViewportInv globalsBlock.size_viewport.zw
 #  define sizePixel globalsBlock.size_pixel
 #  define pixelFac globalsBlock.pixel_fac
 #  define sizeObjectCenter globalsBlock.size_object_center
diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl
deleted file mode 100644
index 495a2e2c3d4..00000000000
--- a/source/blender/draw/intern/shaders/common_globals_lib.glsl
+++ /dev/null
@@ -1,147 +0,0 @@
-#define COMMON_GLOBALS_LIB
-
-#ifdef USE_GPU_SHADER_CREATE_INFO
-#  error Use draw_globals as additional_info instead of common_globals_lib.glsl
-#endif
-
-/* keep in sync with GlobalsUboStorage */
-layout(std140) uniform globalsBlock
-{
-  vec4 colorWire;
-  vec4 colorWireEdit;
-  vec4 colorActive;
-  vec4 colorSelect;
-  vec4 colorLibrarySelect;
-  vec4 colorLibrary;
-  vec4 colorTransform;
-  vec4 colorLight;
-  vec4 colorSpeaker;
-  vec4 colorCamera;
-  vec4 colorCameraPath;
-  vec4 colorEmpty;
-  vec4 colorVertex;
-  vec4 colorVertexSelect;
-  vec4 colorVertexUnreferenced;
-  vec4 colorVertexMissingData;
-  vec4 colorEditMeshActive;
-  vec4 colorEdgeSelect;
-  vec4 colorEdgeSeam;
-  vec4 colorEdgeSharp;
-  vec4 colorEdgeCrease;
-  vec4 colorEdgeBWeight;
-  vec4 colorEdgeFaceSelect;
-  vec4 colorEdgeFreestyle;
-  vec4 colorFace;
-  vec4 colorFaceSelect;
-  vec4 colorFaceFreestyle;
-  vec4 colorGpencilVertex;
-  vec4 colorGpencilVertexSelect;
-  vec4 colorNormal;
-  vec4 colorVNormal;
-  vec4 colorLNormal;
-  vec4 colorFaceDot;
-  vec4 colorSkinRoot;
-  vec4 colorDeselect;
-  vec4 colorOutline;
-  vec4 colorLightNoAlpha;
-
-  vec4 colorBackground;
-  vec4 colorBackgroundGradient;
-  vec4 colorCheckerPrimary;
-  vec4 colorCheckerSecondary;
-  vec4 colorClippingBorder;
-  vec4 colorEditMeshMiddle;
-
-  vec4 colorHandleFree;
-  vec4 colorHandleAuto;
-  vec4 colorHandleVect;
-  vec4 colorHandleAlign;
-  vec4 colorHandleAutoclamp;
-  vec4 colorHandleSelFree;
-  vec4 colorHandleSelAuto;
-  vec4 colorHandleSelVect;
-  vec4 colorHandleSelAlign;
-  vec4 colorHandleSelAutoclamp;
-  vec4 colorNurbUline;
-  vec4 colorNurbVline;
-  vec4 colorNurbSelUline;
-  vec4 colorNurbSelVline;
-  vec4 colorActiveSpline;
-
-  vec4 colorBonePose;
-  vec4 colorBonePoseActive;
-  vec4 colorBonePoseActiveUnsel;
-  vec4 colorBonePoseConstraint;
-  vec4 colorBonePoseIK;
-  vec4 colorBonePoseSplineIK;
-  vec4 colorBonePoseTarget;
-  vec4 colorBoneSolid;
-  vec4 colorBoneLocked;
-  vec4 colorBoneActive;
-  vec4 colorBoneActiveUnsel;
-  vec4 colorBoneSelect;
-  vec4 colorBoneIKLine;
-  vec4 colorBoneIKLineNoTarget;
-  vec4 colorBoneIKLineSpline;
-
-  vec4 colorText;
-  vec4 colorTextHi;
-
-  vec4 colorBundleSolid;
-
-  vec4 colorMballRadius;
-  vec4 colorMballRadiusSelect;
-  vec4 colorMballStiffness;
-  vec4 colorMballStiffnessSelect;
-
-  vec4 colorCurrentFrame;
-
-  vec4 colorGrid;
-  vec4 colorGridEmphasis;
-  vec4 colorGridAxisX;
-  vec4 colorGridAxisY;
-  vec4 colorGridAxisZ;
-
-  vec4 colorFaceBack;
-  vec4 colorFaceFront;
-
-  vec4 colorUVShadow;
-
-  vec4 sizeViewport; /* Inverted size in zw. */
-
-  float sizePixel; /* This one is for DPI scaling. */
-  float pixelFac;  /* To use with mul_project_m4_v3_zfac() */
-  float sizeObjectCenter;
-  float sizeLightCenter;
-  float sizeLightCircle;
-  float sizeLightCircleShadow;
-  float sizeVertex;
-  float sizeEdge;
-  float sizeEdgeFix;
-  float sizeFaceDot;
-  float sizeChecker;
-  float sizeVertexGpencil;
-};
-
-#define sizeViewportInv (sizeViewport.zw)
-
-/* See: 'draw_cache_impl.h' for matching includes. */
-#define VERT_GPENCIL_BEZT_HANDLE (1 << 30)
-/* data[0] (1st byte flags) */
-#define FACE_ACTIVE (1 << 0)
-#define FACE_SELECTED (1 << 1)
-#define FACE_FREESTYLE (1 << 2)
-#define VERT_UV_SELECT (1 << 3)
-#define VERT_UV_PINNED (1 << 4)
-#define EDGE_UV_SELECT (1 << 5)
-#define FACE_UV_ACTIVE (1 << 6)
-#define FACE_UV_SELECT (1 << 7)
-/* data[1] (2st byte flags) */
-#define VERT_ACTIVE (1 << 0)
-#define VERT_SELECTED (1 << 1)
-#define VERT_SELECTED_BEZT_HANDLE (1 << 2)
-#define EDGE_ACTIVE (1 << 3)
-#define EDGE_SELECTED (1 << 4)
-#define EDGE_SEAM (1 << 5)
-#define EDGE_SHARP (1 << 6)
-#define EDGE_FREESTYLE (1 << 7)