diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-01-17 16:45:22 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-17 16:46:32 +0300 |
| commit | 9d3f35a0bf1bf5776363bfd61d53a7c85b5827a4 (patch) | |
| tree | 595fe492f09aea9f97049339385f7966ac02f0e1 /source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl | |
| parent | edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7 (diff) | |
Revert "Revert "GPUShaderCreateInfo for interface abstraction""
This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7.
Fixes compilation error (Missing file BLI_float2.hh)
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl')
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl index 2e229d4d83a..c784c8b2db9 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl @@ -1,3 +1,5 @@ + +#ifndef WORKBENCH_SHADER_SHARED_H struct LightData { vec4 direction; vec4 specular_color; @@ -37,9 +39,10 @@ struct WorldData { int _pad2; }; -#define viewport_size_inv viewport_size.zw +# define viewport_size_inv viewport_size.zw layout(std140) uniform world_block { WorldData world_data; }; +#endif |