[Bf-blender-cvs] [8e49d81] temp_viewport_fx_merge: minor cleanup

Mike Erwin noreply at git.blender.org
Wed Apr 1 20:25:23 CEST 2015


Commit: 8e49d815d14451ac661f4bfb1e22f29702f7f9da
Author: Mike Erwin
Date:   Wed Apr 1 13:08:56 2015 -0400
Branches: temp_viewport_fx_merge
https://developer.blender.org/rB8e49d815d14451ac661f4bfb1e22f29702f7f9da

minor cleanup

===================================================================

M	source/blender/gpu/GPU_common.h
M	source/blender/gpu/GPU_matrix.h
M	source/blender/gpu/intern/gpu_select.c
M	source/blender/gpu/intern/gpu_vertex_stream.c

===================================================================

diff --git a/source/blender/gpu/GPU_common.h b/source/blender/gpu/GPU_common.h
index ba72ead..75e3487 100644
--- a/source/blender/gpu/GPU_common.h
+++ b/source/blender/gpu/GPU_common.h
@@ -57,10 +57,10 @@ void GPU_common_disable_normal_array  (void);
 void GPU_common_disable_color_array   (void);
 void GPU_common_disable_texcoord_array(void);
 
-void GPU_common_vertex_pointer  (GLint size, GLenum type, GLsizei stride,                       const GLvoid* pointer);
-void GPU_common_normal_pointer  (            GLenum type, GLsizei stride, GLboolean normalized, const GLvoid* pointer);
-void GPU_common_color_pointer   (GLint size, GLenum type, GLsizei stride,                       const GLvoid* pointer);
-void GPU_common_texcoord_pointer(GLint size, GLenum type, GLsizei stride,                       const GLvoid* pointer);
+void GPU_common_vertex_pointer  (GLint size, GLenum type, GLsizei stride,                       const GLvoid *pointer);
+void GPU_common_normal_pointer  (            GLenum type, GLsizei stride, GLboolean normalized, const GLvoid *pointer);
+void GPU_common_color_pointer   (GLint size, GLenum type, GLsizei stride,                       const GLvoid *pointer);
+void GPU_common_texcoord_pointer(GLint size, GLenum type, GLsizei stride,                       const GLvoid *pointer);
 
 void  GPU_set_common_active_texture(GLint texture);
 GLint GPU_get_common_active_texture(void);
diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h
index c4df45c..70ecaec 100644
--- a/source/blender/gpu/GPU_matrix.h
+++ b/source/blender/gpu/GPU_matrix.h
@@ -49,7 +49,7 @@ void   gpuMatrixMode(GLenum mode);
 GLenum gpuGetMatrixMode(void);
 
 void gpuLoadMatrix(const GLfloat m[16]);
-const GLfloat* gpuGetMatrix(GLenum type, GLfloat m[16]);
+const GLfloat *gpuGetMatrix(GLenum type, GLfloat m[16]);
 
 void gpuLoadIdentity(void);
 
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index e0e17e8..c0aec7b 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -61,7 +61,7 @@ typedef struct GPUQueryState {
 	bool use_gpu_select;
 	/* cache on initialization */
 	unsigned int *buffer;
-	/* buffer size (stores number of integers, for actual size multiply by sizeof integer)*/
+	/* buffer size (stores number of integers, for actual size multiply by sizeof integer) */
 	unsigned int bufsize;
 	/* mode of operation */
 	char mode;
diff --git a/source/blender/gpu/intern/gpu_vertex_stream.c b/source/blender/gpu/intern/gpu_vertex_stream.c
index b504fb6..67b319b 100644
--- a/source/blender/gpu/intern/gpu_vertex_stream.c
+++ b/source/blender/gpu/intern/gpu_vertex_stream.c
@@ -27,7 +27,7 @@
 
 
 /* Vertex stream implementation - this will abstract the various methods that will be used
- * to stream vertex data on the GPU. Depending on the undelying implementation,
+ * to stream vertex data on the GPU. Depending on the underlying implementation,
  * vertex array objects, vertex arrays or vertex buffer objects will be used.
  * A Vertex stream only makes sense for one specific material, since it references
  * attribute bind positions for that material */
@@ -35,7 +35,7 @@
 /* set one */
 typedef struct GPUAttributeSlot {
 	int shader_location; /* location of attribute for the */
-	int data_type; /* data type, INT, FLOAT, SHORT etc */
+	int data_type; /* INT, FLOAT, SHORT etc */
 } GPUAttributeSlot;
 
 typedef struct GPUVertexStream {
@@ -53,8 +53,7 @@ typedef struct GPUMaterialN {
 	void (*updateGLstate)(void);
 } GPUMaterialN;
 
-void GPU_create_new_stream (GPUMaterialN *mat)
+void GPU_create_new_stream(GPUMaterialN *mat)
 {
 
 }
-




More information about the Bf-blender-cvs mailing list