Page MenuHome
Differential D15007 Diff 51711 source/blender/draw/engines/overlay/overlay_shader_shared.h

Changeset View

Standalone View

View Options

source/blender/draw/engines/overlay/overlay_shader_shared.h

Show All 18 Lines
#define BG_SOLID 0 #define BG_SOLID 0
#define BG_GRADIENT 1 #define BG_GRADIENT 1
#define BG_CHECKER 2 #define BG_CHECKER 2
#define BG_RADIAL 3 #define BG_RADIAL 3
#define BG_SOLID_CHECKER 4 #define BG_SOLID_CHECKER 4
#define BG_MASK 5 #define BG_MASK 5
enum OVERLAY_GridBits { enum OVERLAY_GridBits {
SHOW_AXIS_X = (1 << 0), SHOW_AXIS_X = (1u << 0),
fclemUnsubmitted
Not Done
Inline Actions
enum OVERLAY_GridBits {
- SHOW_AXIS_X = (1u << 0),
+ SHOW_AXIS_X = (1u << 0u),
SHOW_AXIS_Y = (1u << 1),

Use same suffix. Some implementation have warning about mixed type shifting.

fclem: Use same suffix. Some implementation have warning about mixed type shifting.
SHOW_AXIS_Y = (1 << 1), SHOW_AXIS_Y = (1u << 1),
SHOW_AXIS_Z = (1 << 2), SHOW_AXIS_Z = (1u << 2),
SHOW_GRID = (1 << 3), SHOW_GRID = (1u << 3),
PLANE_XY = (1 << 4), PLANE_XY = (1u << 4),
PLANE_XZ = (1 << 5), PLANE_XZ = (1u << 5),
PLANE_YZ = (1 << 6), PLANE_YZ = (1u << 6),
CLIP_ZPOS = (1 << 7), CLIP_ZPOS = (1u << 7),
CLIP_ZNEG = (1 << 8), CLIP_ZNEG = (1u << 8),
GRID_BACK = (1 << 9), GRID_BACK = (1u << 9),
GRID_CAMERA = (1 << 10), GRID_CAMERA = (1u << 10),
PLANE_IMAGE = (1 << 11), PLANE_IMAGE = (1u << 11),
CUSTOM_GRID = (1 << 12), CUSTOM_GRID = (1u << 12),
}; };
/* Match: #SI_GRID_STEPS_LEN */ /* Match: #SI_GRID_STEPS_LEN */
#define OVERLAY_GRID_STEPS_LEN 8 #define OVERLAY_GRID_STEPS_LEN 8
struct OVERLAY_GridData { struct OVERLAY_GridData {
float4 steps[OVERLAY_GRID_STEPS_LEN]; /* float arrays are padded to float4 in std130. */ float4 steps[OVERLAY_GRID_STEPS_LEN]; /* float arrays are padded to float4 in std130. */
float4 size; /* float3 padded to float4. */ float4 size; /* float3 padded to float4. */
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines