3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index cc005e5b6e1..d1e74fc8b3f 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -421,14 +421,14 @@ static void codegen_set_texid(GHash *bindhash, GPUInput *input, int *texid, void
 {
 	if (BLI_ghash_haskey(bindhash, key)) {
 		/* Reuse existing texid */
-		input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, key));
+		input->texid = POINTER_AS_INT(BLI_ghash_lookup(bindhash, key));
 	}
 	else {
 		/* Allocate new texid */
 		input->texid = *texid;
 		(*texid)++;
 		input->bindtex = true;
-		BLI_ghash_insert(bindhash, key, SET_INT_IN_POINTER(input->texid));
+		BLI_ghash_insert(bindhash, key, POINTER_FROM_INT(input->texid));
 	}
 }
 
@@ -478,13 +478,13 @@ static void codegen_set_unique_ids(ListBase *nodes)
 					if (input->ima) {
 						if (!BLI_ghash_haskey(definehash, input->ima)) {
 							input->definetex = true;
-							BLI_ghash_insert(definehash, input->ima, SET_INT_IN_POINTER(input->texid));
+							BLI_ghash_insert(definehash, input->ima, POINTER_FROM_INT(input->texid));
 						}
 					}
 					else {
 						if (!BLI_ghash_haskey(definehash, input->link)) {
 							input->definetex = true;
-							BLI_ghash_insert(definehash, input->link, SET_INT_IN_POINTER(input->texid));
+							BLI_ghash_insert(definehash, input->link, POINTER_FROM_INT(input->texid));
 						}
 					}
 				}
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index fbb6a845a96..ec2ff7615d5 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -46,9 +46,9 @@ struct GPUVertexAttribs;
 struct PreviewImage;
 
 /* Pass Generation
- *  - Takes a list of nodes and a desired output, and makes a pass. This
- *    will take ownership of the nodes and free them early if unused or
- *    at the end if used.
+ * - Takes a list of nodes and a desired output, and makes a pass. This
+ *   will take ownership of the nodes and free them early if unused or
+ *   at the end if used.
  */
 
 typedef enum GPUDataSource {
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 66945b13aba..5e35b9279d4 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -280,7 +280,7 @@ static void gpu_dump_shaders(const char **code, const int num_shaders, const cha
 	}
 
 	/* We use the same shader index for shaders in the same program.
-	 * So we call this function once before calling for the invidual shaders. */
+	 * So we call this function once before calling for the individual shaders. */
 	static int shader_index = 0;
 	if (code == NULL) {
 		shader_index++;