Revision: 23615
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23615
Author: imbusy
Date: 2009-10-03 17:35:01 +0200 (Sat, 03 Oct 2009)
Log Message:
-----------
imbusy GSoC'09 branch merge (Vertex Buffer Object support)
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/editors/include/BIF_glutil.h
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_customdata_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
trunk/blender/source/blender/windowmanager/wm_subwindow.h
Added Paths:
-----------
trunk/blender/source/blender/gpu/gpu_buffers.h
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-10-03 11:23:31 UTC
(rev 23614)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-10-03 15:35:01 UTC
(rev 23615)
@@ -314,6 +314,7 @@
sub1.itemL(text="OpenGL:")
sub1.itemR(system, "clip_alpha", slider=True)
sub1.itemR(system, "use_mipmaps")
+ sub1.itemR(system, "use_vbos")
sub1.itemL(text="Window Draw Method:")
sub1.row().itemR(system, "window_draw_method", expand=True)
sub1.itemL(text="Textures:")
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2009-10-03
11:23:31 UTC (rev 23614)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2009-10-03
15:35:01 UTC (rev 23615)
@@ -58,6 +58,7 @@
struct MCol;
struct ColorBand;
struct GPUVertexAttribs;
+struct GPUDrawObject;
/* number of sub-elements each mesh element has (for interpolation) */
#define SUB_ELEMS_VERT 0
@@ -72,6 +73,7 @@
int needsFree; /* checked on ->release, is set to 0 for cached results
*/
int deformedOnly; /* set by modifier stack if only deformed from
original */
BVHCache bvhCache;
+ struct GPUDrawObject *drawObject;
/* Misc. Queries */
Modified: trunk/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_paint.h 2009-10-03 11:23:31 UTC
(rev 23614)
+++ trunk/blender/source/blender/blenkernel/BKE_paint.h 2009-10-03 15:35:01 UTC
(rev 23615)
@@ -88,6 +88,8 @@
struct SculptStroke *stroke;
struct StrokeCache *cache;
+
+ struct GPUDrawObject *drawobject;
} SculptSession;
void free_sculptsession(SculptSession **);
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-10-03 11:23:31 UTC (rev 23614)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-10-03 15:35:01 UTC (rev 23615)
@@ -84,6 +84,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
+#include "gpu_buffers.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
#include "GPU_material.h"
@@ -218,7 +219,7 @@
{
if (dm->needsFree) {
bvhcache_free(&dm->bvhCache);
-
+ GPU_drawobject_free( dm );
CustomData_free(&dm->vertData, dm->numVertData);
CustomData_free(&dm->edgeData, dm->numEdgeData);
CustomData_free(&dm->faceData, dm->numFaceData);
@@ -491,14 +492,55 @@
}
glEnd();
} else {
- glBegin(GL_LINES);
- for(i=0,eed= emdm->em->edges.first; eed; i++,eed= eed->next) {
- if(!setDrawOptions || setDrawOptions(userData, i)) {
- glVertex3fv(eed->v1->co);
- glVertex3fv(eed->v2->co);
+ GPUBuffer *buffer = 0;
+ float *varray;
+ if( setDrawOptions == 0 ) {
+ buffer = GPU_buffer_alloc(
sizeof(float)*3*2*emdm->em->totedge, 0 );
+ }
+ if( buffer != 0 && (varray = GPU_buffer_lock_stream( buffer ))
) {
+ int prevdraw = 0;
+ int numedges = 0;
+ int draw = 0;
+ int datatype[] = { GPU_BUFFER_INTER_V3F,
GPU_BUFFER_INTER_END };
+ GPU_buffer_unlock( buffer );
+ GPU_interleaved_setup( buffer, datatype );
+ varray = GPU_buffer_lock_stream( buffer );
+ for(i=0,eed= emdm->em->edges.first; eed; i++,eed=
eed->next) {
+ if(!setDrawOptions || setDrawOptions(userData,
i)) {
+ draw = 1;
+ } else {
+ draw = 0;
+ }
+ if( prevdraw != draw && prevdraw != 0 &&
numedges > 0) {
+ GPU_buffer_unlock( buffer );
+ glDrawArrays(GL_LINES,0,numedges*2);
+ varray = GPU_buffer_lock_stream( buffer
);
+ numedges = 0;
+ }
+ if( draw != 0 ) {
+
VECCOPY(&varray[numedges*6],eed->v1->co);
+
VECCOPY(&varray[numedges*6+3],eed->v2->co);
+ numedges++;
+ }
+ prevdraw = draw;
}
+ GPU_buffer_unlock( buffer );
+ if( prevdraw != 0 && numedges > 0) {
+ glDrawArrays(GL_LINES,0,numedges*2);
+ }
+ GPU_buffer_unbind();
+ } else {
+ glBegin(GL_LINES);
+ for(i=0,eed= emdm->em->edges.first; eed; i++,eed=
eed->next) {
+ if(!setDrawOptions || setDrawOptions(userData,
i)) {
+ glVertex3fv(eed->v1->co);
+ glVertex3fv(eed->v2->co);
+ }
+ }
+ glEnd();
}
- glEnd();
+ if( buffer != 0 )
+ GPU_buffer_free( buffer, 0 );
}
}
static void emDM_drawEdges(DerivedMesh *dm, int drawLooseEdges)
@@ -627,8 +669,8 @@
draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, i, &drawSmooth);
if(draw) {
if (draw==2) { /* enabled with stipple */
- glEnable(GL_POLYGON_STIPPLE);
- glPolygonStipple(stipple_quarttone);
+ glEnable(GL_POLYGON_STIPPLE);
+ glPolygonStipple(stipple_quarttone);
}
glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
@@ -659,41 +701,135 @@
}
}
} else {
- for (i=0,efa= emdm->em->faces.first; efa; i++,efa= efa->next) {
- int drawSmooth = (efa->flag & ME_SMOOTH);
- draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, i, &drawSmooth);
- if(draw) {
- if (draw==2) { /* enabled with stipple */
- glEnable(GL_POLYGON_STIPPLE);
- glPolygonStipple(stipple_quarttone);
+ GPUBuffer *buffer = 0;
+ float *varray;
+ if( setDrawOptions == 0 ) {
+ /* 3 floats for position, 3 for normal and times two
because the faces may actually be quads instead of triangles */
+ buffer = GPU_buffer_alloc(
sizeof(float)*6*emdm->em->totface*3*2, 0 );
+ }
+ if( buffer != 0 && (varray = GPU_buffer_lock_stream( buffer ))
) {
+ int prevdraw = 0;
+ int numfaces = 0;
+ int datatype[] = { GPU_BUFFER_INTER_V3F,
GPU_BUFFER_INTER_N3F, GPU_BUFFER_INTER_END };
+ GPU_buffer_unlock( buffer );
+ GPU_interleaved_setup( buffer, datatype );
+ glShadeModel(GL_SMOOTH);
+ varray = GPU_buffer_lock_stream( buffer );
+ for (i=0,efa= emdm->em->faces.first; efa; i++,efa=
efa->next) {
+ int drawSmooth = (efa->flag & ME_SMOOTH);
+ draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, i, &drawSmooth);
+ if( prevdraw != draw && prevdraw != 0 &&
numfaces > 0) {
+ if( prevdraw==2 ) {
+ glEnable(GL_POLYGON_STIPPLE);
+
glPolygonStipple(stipple_quarttone);
+ }
+ GPU_buffer_unlock( buffer );
+ glDrawArrays(GL_TRIANGLES,0,numfaces*3);
+ if( prevdraw==2 ) {
+ glDisable(GL_POLYGON_STIPPLE);
+ }
+ varray = GPU_buffer_lock_stream( buffer
);
+ numfaces = 0;
}
- glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
+ if( draw != 0 ) {
+ if(!drawSmooth) {
+
VECCOPY(&varray[numfaces*18],efa->v1->co);
+
VECCOPY(&varray[numfaces*18+3],efa->n);
- glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
- if (!drawSmooth) {
- glNormal3fv(efa->n);
- glVertex3fv(efa->v1->co);
- glVertex3fv(efa->v2->co);
- glVertex3fv(efa->v3->co);
- if(efa->v4) glVertex3fv(efa->v4->co);
- } else {
- glNormal3fv(efa->v1->no);
- glVertex3fv(efa->v1->co);
- glNormal3fv(efa->v2->no);
- glVertex3fv(efa->v2->co);
- glNormal3fv(efa->v3->no);
- glVertex3fv(efa->v3->co);
- if(efa->v4) {
- glNormal3fv(efa->v4->no);
- glVertex3fv(efa->v4->co);
+
VECCOPY(&varray[numfaces*18+6],efa->v2->co);
+
VECCOPY(&varray[numfaces*18+9],efa->n);
+
+
VECCOPY(&varray[numfaces*18+12],efa->v3->co);
+
VECCOPY(&varray[numfaces*18+15],efa->n);
+ numfaces++;
+ if( efa->v4 ) {
+
VECCOPY(&varray[numfaces*18],efa->v3->co);
+
VECCOPY(&varray[numfaces*18+3],efa->n);
+
+
VECCOPY(&varray[numfaces*18+6],efa->v4->co);
+
VECCOPY(&varray[numfaces*18+9],efa->n);
+
+
VECCOPY(&varray[numfaces*18+12],efa->v1->co);
+
VECCOPY(&varray[numfaces*18+15],efa->n);
+ numfaces++;
+ }
}
+ else {
+
VECCOPY(&varray[numfaces*18],efa->v1->co);
+
VECCOPY(&varray[numfaces*18+3],efa->v1->no);
+
+
VECCOPY(&varray[numfaces*18+6],efa->v2->co);
+
VECCOPY(&varray[numfaces*18+9],efa->v2->no);
+
+
VECCOPY(&varray[numfaces*18+12],efa->v3->co);
+
VECCOPY(&varray[numfaces*18+15],efa->v3->no);
+ numfaces++;
+ if( efa->v4 ) {
+
VECCOPY(&varray[numfaces*18],efa->v3->co);
+
VECCOPY(&varray[numfaces*18+3],efa->v3->no);
+
+
VECCOPY(&varray[numfaces*18+6],efa->v4->co);
+
VECCOPY(&varray[numfaces*18+9],efa->v4->no);
+
+
VECCOPY(&varray[numfaces*18+12],efa->v1->co);
+
VECCOPY(&varray[numfaces*18+15],efa->v1->no);
+ numfaces++;
+ }
+ }
}
- glEnd();
-
- if (draw==2)
+ prevdraw = draw;
+ }
+ GPU_buffer_unlock( buffer );
+ if( prevdraw != 0 && numfaces > 0) {
+ if( prevdraw==2 ) {
+ glEnable(GL_POLYGON_STIPPLE);
+ glPolygonStipple(stipple_quarttone);
+ }
+ glDrawArrays(GL_TRIANGLES,0,numfaces*3);
+ if( prevdraw==2 ) {
glDisable(GL_POLYGON_STIPPLE);
+ }
}
+ GPU_buffer_unbind();
+ } else {
+ for (i=0,efa= emdm->em->faces.first; efa; i++,efa=
efa->next) {
+ int drawSmooth = (efa->flag & ME_SMOOTH);
+ draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, i, &drawSmooth);
+ if(draw) {
+ if (draw==2) { /* enabled with stipple
*/
+ glEnable(GL_POLYGON_STIPPLE);
+
glPolygonStipple(stipple_quarttone);
+ }
+
glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
+
+ glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
+ if (!drawSmooth) {
+ glNormal3fv(efa->n);
+ glVertex3fv(efa->v1->co);
+ glVertex3fv(efa->v2->co);
+ glVertex3fv(efa->v3->co);
+ if(efa->v4)
glVertex3fv(efa->v4->co);
+ } else {
+ glNormal3fv(efa->v1->no);
+ glVertex3fv(efa->v1->co);
+ glNormal3fv(efa->v2->no);
+ glVertex3fv(efa->v2->co);
+ glNormal3fv(efa->v3->no);
+ glVertex3fv(efa->v3->co);
+ if(efa->v4) {
+
glNormal3fv(efa->v4->no);
+
glVertex3fv(efa->v4->co);
+ }
+ }
+ glEnd();
+
+ if (draw==2)
+ glDisable(GL_POLYGON_STIPPLE);
+ }
+ }
}
+ if( buffer != 0 )
+ GPU_buffer_free( buffer, 0 );
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2009-10-03 11:23:31 UTC (rev 23614)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2009-10-03 15:35:01 UTC (rev 23615)
@@ -60,6 +60,7 @@
#include "MEM_guardedalloc.h"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
