[Bf-blender-cvs] [38125d3] temp_viewport_fx_merge: Small cleanup

[Antony Riakiotakis]

Commit: 38125d3547041d31e57afcdfd1a7eaa69a351589
Author: Antony Riakiotakis
Date:   Wed Apr 1 17:16:26 2015 +0200
Branches: temp_viewport_fx_merge
https://developer.blender.org/rB38125d3547041d31e57afcdfd1a7eaa69a351589

Small cleanup

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

M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/gpu/GPU_immediate.h
M	source/blender/gpu/intern/gpu_immediate.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 1ba4d5b..08fb315 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -548,8 +548,8 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d)
 		const float f5 = 0.25f * U.widget_unit;
 		const float f10 = 0.5f * U.widget_unit;
 		const float f20 = U.widget_unit;
-		
-		setlinestyle(0); 
+
+		setlinestyle(0);
 		cpack(0xFF);
 		circ((float)co[0], (float)co[1], f10);
 		setlinestyle(4);
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h
index d45e0ec..bec59c2 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -596,6 +596,16 @@ BLI_INLINE void gpuColor4d(GLdouble r, GLdouble g, GLdouble b, GLdouble a)
 }
 
 
+#define CPACK_BLACK   0x000000
+#define CPACK_WHITE   0xFFFFFF
+
+#define CPACK_RED     0xFF0000
+#define CPACK_GREEN   0x00FF00
+#define CPACK_BLUE    0x0000FF
+
+#define CPACK_YELLOW  0xFFFF00
+#define CPACK_CYAN    0x00FFFF
+#define CPACK_MAGENTA 0xFF00FF
 
 /* This function converts a numerical value to the equivalent 24-bit
  * color, while not being endian-sensitive. On little-endians, this
@@ -771,8 +781,6 @@ BLI_INLINE void gpuMultiTexCoord4fv(GLint index, const GLfloat *v)
 }
 
 
-
-
 BLI_INLINE void gpuVertexAttrib2fv(GLsizei index, const GLfloat *v)
 {
 	GPU_IMMEDIATE->attrib_f[index][0] = v[0];
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c
index 37e4cf3..5907ecf 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.c
@@ -82,9 +82,9 @@ typedef struct GPURAMArrayStream {
 } GPURAMArrayStream;
 
 enum StreamTypes {
-	eStreamTypeVertexArray = 0,
-	eStreamTypeRAM,
-	eStreamTypeVertexBuffer,
+	eStreamTypeVertexArray  = 0,
+	eStreamTypeRAM          = 1,
+	eStreamTypeVertexBuffer = 2,
 };
 
 static void alloc_stream_ram(GPUVertexStream *stream, size_t newsize)
@@ -322,7 +322,7 @@ static void allocate(void)
 	newSize = (size_t)(GPU_IMMEDIATE->stride * GPU_IMMEDIATE->maxVertexCount);
 
 	if (!GPU_IMMEDIATE->vertex_stream) {
-		GPU_IMMEDIATE->vertex_stream = gpu_new_vertex_stream(eStreamTypeVertexArray, GL_ARRAY_BUFFER);
+		GPU_IMMEDIATE->vertex_stream = gpu_new_vertex_stream(eStreamTypeRAM, GL_ARRAY_BUFFER);
 	}
 
 	vertex_stream = (GPUVertexStream*)GPU_IMMEDIATE->vertex_stream;
@@ -414,7 +414,7 @@ static void setup(void)
 static void unsetup(void)
 {
 	size_t i;
-	GPUVertexStream    *vertex_stream = (GPUVertexStream*)(GPU_IMMEDIATE->vertex_stream);
+	GPUVertexStream *vertex_stream = (GPUVertexStream*)(GPU_IMMEDIATE->vertex_stream);
 
 	/* vertex */
 	GPU_common_disable_vertex_array();
@@ -478,7 +478,7 @@ static void allocateIndex(void)
 		}
 
 		if (!index->element_stream) {
-			index->element_stream = gpu_new_vertex_stream(eStreamTypeVertexBuffer, GL_ELEMENT_ARRAY_BUFFER);
+			index->element_stream = gpu_new_vertex_stream(eStreamTypeRAM, GL_ELEMENT_ARRAY_BUFFER);
 		}
 
 		element_stream = index->element_stream;
@@ -495,6 +495,7 @@ static void static_element_array(GLuint *idOut, GLsizeiptr size, const GLvoid *i
 	glGenBuffers(1, idOut);
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, *idOut);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, indexes, GL_STATIC_DRAW);
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 }
 
 
@@ -513,8 +514,6 @@ static GLubyte  *vqeoc;
 static GLuint vqeos_buf;
 static GLuint vqeoc_buf;
 
-
-
 static void quad_free_heap(void)
 {
 	if (vqeoc) {
@@ -680,8 +679,7 @@ void gpu_end_buffer_gl(void)
 			}
 
 			if (vqeoc_buf != 0 || vqeos_buf != 0) {
-				GPUVertexStream *element_stream = (GPUVertexStream*)(GPU_IMMEDIATE->index->element_stream);
-				element_stream->bind(element_stream);
+				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 			}
 
 			GPU_ASSERT_NO_GL_ERRORS("gpu_end_buffer_gl end");
@@ -941,7 +939,6 @@ GPUImmediate *GPU_IMMEDIATE = NULL;
 void gpuBegin(GLenum mode)
 {
 	int primMod;
-	int primOff;
 
 	GPU_CHECK_CAN_BEGIN();
 
@@ -956,28 +953,23 @@ void gpuBegin(GLenum mode)
 	switch (mode) {
 		case GL_LINES:
 			primMod = 2;
-			primOff = 0;
 			break;
 
 		case GL_QUAD_STRIP:
 		case GL_TRIANGLE_STRIP:
 			primMod = 2;
-			primOff = 2;
 			break;
 
 		case GL_TRIANGLES:
 			primMod = 3;
-			primOff = 0;
 			break;
 
 		case GL_QUADS:
 			primMod = 4;
-			primOff = 2;
 			break;
 
 		default:
 			primMod = 1;
-			primOff = 0;
 			break;
 	}