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_shader_interface_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_shader_interface_lib.glsl')
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl index 6bfa351aeb0..178e61c8a8d 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl @@ -1,15 +1,17 @@ +#ifndef WORKBENCH_SHADER_SHARED_H IN_OUT ShaderStageInterface { vec3 normal_interp; vec3 color_interp; float alpha_interp; vec2 uv_interp; -#ifdef TRANSPARENT_MATERIAL +# ifdef TRANSPARENT_MATERIAL flat float roughness; flat float metallic; -#else +# else flat float packed_rough_metal; -#endif +# endif flat int object_id; }; +#endif |