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/gpu/shaders/gpu_shader_3D_smooth_color_vert.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/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl index 4eafb7b7be3..56a1210c957 100644 --- a/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl @@ -1,14 +1,17 @@ +#pragma BLENDER_REQUIRE(gpu_shader_cfg_world_clip_lib.glsl) +#ifndef USE_GPU_SHADER_CREATE_INFO uniform mat4 ModelViewProjectionMatrix; -#ifdef USE_WORLD_CLIP_PLANES +# ifdef USE_WORLD_CLIP_PLANES uniform mat4 ModelMatrix; -#endif +# endif in vec3 pos; in vec4 color; out vec4 finalColor; +#endif void main() { @@ -16,6 +19,6 @@ void main() finalColor = color; #ifdef USE_WORLD_CLIP_PLANES - world_clip_planes_calc_clip_distance((ModelMatrix * vec4(pos, 1.0)).xyz); + world_clip_planes_calc_clip_distance((clipPlanes.ModelMatrix * vec4(pos, 1.0)).xyz); #endif } |