diff options
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_vertex.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_vertex.glsl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_vertex.glsl b/source/blender/gpu/shaders/gpu_shader_vertex.glsl index db0068d2f3d..2a6c137e195 100644 --- a/source/blender/gpu/shaders/gpu_shader_vertex.glsl +++ b/source/blender/gpu/shaders/gpu_shader_vertex.glsl @@ -1,3 +1,8 @@ + +uniform mat4 ModelViewMatrix; +uniform mat4 ProjectionMatrix; +uniform mat3 NormalMatrix; + #ifdef USE_OPENSUBDIV in vec3 normal; in vec4 position; @@ -7,8 +12,8 @@ out block { } outpt; #endif -varying vec3 varposition; -varying vec3 varnormal; +out vec3 varposition; +out vec3 varnormal; #ifdef CLIP_WORKAROUND varying float gl_ClipDistance[6]; @@ -42,11 +47,7 @@ void srgb_to_linearrgb(vec4 col_from, out vec4 col_to) bool is_srgb(int info) { -#ifdef USE_NEW_SHADING return (info == 1)? true: false; -#else - return false; -#endif } void set_var_from_attr(float attr, int info, out float var) @@ -89,11 +90,11 @@ void main() vec3 normal = gl_Normal; #endif - vec4 co = gl_ModelViewMatrix * position; + vec4 co = ModelViewMatrix * position; varposition = co.xyz; - varnormal = normalize(gl_NormalMatrix * normal); - gl_Position = gl_ProjectionMatrix * co; + varnormal = normalize(NormalMatrix * normal); + gl_Position = ProjectionMatrix * co; #ifdef CLIP_WORKAROUND int i; |