diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:02:45 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:03:10 +0300 |
| commit | fd5c1972cd5c8a826c0d40effb0e2d367389666a (patch) | |
| tree | 6a093944267ff888e9fb4323bac22d52468ab7ec /source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl | |
| parent | c80564ef9f557fadd235b87533b24d126e2138c9 (diff) | |
Revert "DRW: Refactor to support draw call batching"
This reverts commit ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce.
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl index 10228a1e985..3e52e43beae 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl @@ -1,5 +1,6 @@ uniform mat4 ViewProjectionMatrix; +uniform mat4 ModelMatrix; /* ---- Instantiated Attrs ---- */ in vec3 pos; @@ -19,10 +20,10 @@ void main() { finalColor = color; - vec4 wPos = InstanceModelMatrix * vec4(pos * size, 1.0); - gl_Position = ViewProjectionMatrix * wPos; + vec4 pos_4d = vec4(pos * size, 1.0); + gl_Position = ViewProjectionMatrix * InstanceModelMatrix * pos_4d; #ifdef USE_WORLD_CLIP_PLANES - world_clip_planes_calc_clip_distance(wPos.xyz); + world_clip_planes_calc_clip_distance((ModelMatrix * InstanceModelMatrix * pos_4d).xyz); #endif } |