Cleanup: replace attrib w/ attr

Also rename GPUVertexAttribs to GPUVertAttrLayers,
avoids confusion with GPUVertAttr which isn't closely related.

7 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 7232db41ee6..4c987391281 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -408,8 +408,8 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
 
 		/* Planar Display */
 		DRW_shgroup_instance_format(e_data.format_probe_display_planar, {
-		    {"probe_id", DRW_ATTRIB_INT, 1},
-		    {"probe_mat", DRW_ATTRIB_FLOAT, 16},
+		    {"probe_id", DRW_ATTR_INT, 1},
+		    {"probe_mat", DRW_ATTR_FLOAT, 16},
 		});
 
 		DRWShadingGroup *grp = DRW_shgroup_instance_create(
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index ac6f0720d7d..34eaa0f46bc 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -478,7 +478,7 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
 	/* Sort transparents before the loop. */
 	DRW_pass_sort_shgroup_z(psl->transparent_pass);
 
-	/* Push instances attribs to the GPU. */
+	/* Push instances attributes to the GPU. */
 	DRW_render_instance_buffer_finish();
 
 	/* Need to be called after DRW_render_instance_buffer_finish() */
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();