diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-28 23:46:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-29 00:32:25 +0300 |
| commit | 68cab3aff63aea95830aa082a160200768d0e826 (patch) | |
| tree | 3a042217ce34d84387cdfcca97316597800396db /source/blender/draw/engines/eevee/shaders | |
| parent | a9c297165878b3c427a20f787cc90a6ada4df253 (diff) | |
Cleanup: replace attrib w/ attr
Also rename GPUVertexAttribs to GPUVertAttrLayers,
avoids confusion with GPUVertAttr which isn't closely related.
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders')
5 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/background_vert.glsl b/source/blender/draw/engines/eevee/shaders/background_vert.glsl index 380d6d96491..8b4bc3382f4 100644 --- a/source/blender/draw/engines/eevee/shaders/background_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/background_vert.glsl @@ -21,7 +21,7 @@ void main() worldNormal = viewNormal = normalize(-viewPosition); #endif -#ifdef ATTRIB - pass_attrib(viewPosition); +#ifdef USE_ATTR + pass_attr(viewPosition); #endif } diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl index 2ce37d867b7..996b507239d 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl @@ -24,8 +24,8 @@ void main() { for (int v = 0; v < 3; ++v) { gl_Position = vPos[v]; worldPosition = x_axis[fFace] * vPos[v].x + y_axis[fFace] * vPos[v].y + maj_axes[fFace]; -#ifdef ATTRIB - pass_attrib(v); +#ifdef USE_ATTR + pass_attr(v); #endif EmitVertex(); } diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl index a6e6f1fac42..ef7213cd21e 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ModelViewProjectionMatrix; uniform mat4 ModelViewMatrix; uniform mat3 WorldNormalMatrix; -#ifndef ATTRIB +#ifndef USE_ATTR uniform mat4 ModelMatrix; uniform mat3 NormalMatrix; uniform mat4 ModelMatrixInverse; @@ -73,7 +73,7 @@ void main() /* Used for planar reflections */ gl_ClipDistance[0] = dot(vec4(worldPosition, 1.0), ClipPlanes[0]); -#ifdef ATTRIB - pass_attrib(pos); +#ifdef USE_ATTR + pass_attr(pos); #endif } diff --git a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl index cfd24ae8d65..2583c7c8765 100644 --- a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl @@ -3,7 +3,7 @@ uniform mat4 ModelViewProjectionMatrix; #ifdef MESH_SHADER uniform mat4 ModelViewMatrix; uniform mat3 WorldNormalMatrix; -# ifndef ATTRIB +# ifndef USE_ATTR uniform mat4 ModelMatrix; uniform mat3 NormalMatrix; # endif @@ -26,8 +26,8 @@ void main() { worldPosition = (ModelMatrix * vec4(pos, 1.0)).xyz; viewNormal = normalize(NormalMatrix * nor); worldNormal = normalize(WorldNormalMatrix * nor); -#ifdef ATTRIB - pass_attrib(pos); +#ifdef USE_ATTR + pass_attr(pos); #endif #endif } diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl index d435bda4f60..72545302fd3 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl @@ -17,20 +17,20 @@ flat out int slice; void main() { gl_Layer = slice = int(vPos[0].z); -#ifdef ATTRIB - pass_attrib(0); +#ifdef USE_ATTR + pass_attr(0); #endif gl_Position = vPos[0].xyww; EmitVertex(); -#ifdef ATTRIB - pass_attrib(1); +#ifdef USE_ATTR + pass_attr(1); #endif gl_Position = vPos[1].xyww; EmitVertex(); -#ifdef ATTRIB - pass_attrib(2); +#ifdef USE_ATTR + pass_attr(2); #endif gl_Position = vPos[2].xyww; EmitVertex(); @@ -46,20 +46,20 @@ void main() { void main() { gl_Layer = slice = int(vPos[0].z); -#ifdef ATTRIB - pass_attrib(0); +#ifdef USE_ATTR + pass_attr(0); #endif gl_Position = vPos[0].xyww; EmitVertex(); -#ifdef ATTRIB - pass_attrib(1); +#ifdef USE_ATTR + pass_attr(1); #endif gl_Position = vPos[1].xyww; EmitVertex(); -#ifdef ATTRIB - pass_attrib(2); +#ifdef USE_ATTR + pass_attr(2); #endif gl_Position = vPos[2].xyww; EmitVertex(); |