diff options
author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/draw/intern/draw_common_shader_shared.h | |
parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/draw/intern/draw_common_shader_shared.h')
-rw-r--r-- | source/blender/draw/intern/draw_common_shader_shared.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_common_shader_shared.h b/source/blender/draw/intern/draw_common_shader_shared.h index 57cb7880ce6..9a5fce52c1e 100644 --- a/source/blender/draw/intern/draw_common_shader_shared.h +++ b/source/blender/draw/intern/draw_common_shader_shared.h @@ -124,8 +124,7 @@ struct GlobalsUboStorage { float4 color_uv_shadow; /* NOTE: Put all color before #UBO_LAST_COLOR. */ - float4 screen_vecs[2]; /* Padded as vec4. */ - float4 size_viewport; /* Packed as vec4. */ + float4 size_viewport; /* Packed as vec4. */ /* Pack individual float at the end of the buffer to avoid alignment errors */ float size_pixel, pixel_fac; @@ -228,8 +227,8 @@ BLI_STATIC_ASSERT_ALIGN(GlobalsUboStorage, 16) # define colorFaceBack globalsBlock.color_face_back # define colorFaceFront globalsBlock.color_face_front # define colorUVShadow globalsBlock.color_uv_shadow -# define screenVecs globalsBlock.screen_vecs # 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 |