[Bf-blender-cvs] [a29d9debe40] tmp-workbench-rewrite2: viewport_size/viewport_size_inv
Miguel Pozo
noreply at git.blender.org
Tue Oct 18 20:06:11 CEST 2022
Commit: a29d9debe40d62009d7feb26e98e5076f96240e3
Author: Miguel Pozo
Date: Tue Oct 18 00:06:01 2022 +0200
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rBa29d9debe40d62009d7feb26e98e5076f96240e3
viewport_size/viewport_size_inv
===================================================================
M source/blender/draw/engines/workbench/workbench_engine.cc
M source/blender/draw/engines/workbench/workbench_shader_shared.h
===================================================================
diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index f6c7b600aae..2a2ead29a17 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -81,6 +81,11 @@ class Instance {
bool reset_taa = false;
+ UniformBuffer<WorldData> &world_buf = resources.world_buf;
+
+ world_buf.viewport_size = DRW_viewport_size_get();
+ world_buf.viewport_size_inv = DRW_viewport_invert_size_get();
+
cull_state = shading.flag & V3D_SHADING_BACKFACE_CULLING ? DRW_STATE_CULL_BACK :
DRW_STATE_NO_DRAW;
diff --git a/source/blender/draw/engines/workbench/workbench_shader_shared.h b/source/blender/draw/engines/workbench/workbench_shader_shared.h
index 68665b67293..b7667bbc957 100644
--- a/source/blender/draw/engines/workbench/workbench_shader_shared.h
+++ b/source/blender/draw/engines/workbench/workbench_shader_shared.h
@@ -13,7 +13,8 @@ struct LightData {
};
struct WorldData {
- float4 viewport_size;
+ float2 viewport_size;
+ float2 viewport_size_inv;
float4 object_outline_color;
float4 shadow_direction_vs;
float shadow_focus;
@@ -46,5 +47,3 @@ struct WorldData {
float4 background_color;
};
-
-#define viewport_size_inv viewport_size.zw
More information about the Bf-blender-cvs
mailing list