diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-20 13:12:28 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-20 13:12:28 +0300 |
| commit | cb6fc9d14179cff9b0b2b38cf9a1fdec5a409298 (patch) | |
| tree | 279804d58389d072b98a4803bdba9624d87186ca /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 422ffd252ac5f73f27f3c91b75b5d20a0ed7d460 (diff) | |
Use abstraction to unbind buffers, should avoid crashes in systems that
don't support VBOs.
Exposed by initialization error in GLEW, which should be fixed
seperately.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 5553de4ead7..9a41c7397ae 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -359,7 +359,7 @@ static void cdDM_drawVerts(DerivedMesh *dm) glDrawArrays(GL_POINTS, 0, dm->drawObject->tot_loop_verts); else glDrawArrays(GL_POINTS, 0, dm->drawObject->tot_loose_point); - GPU_buffer_unbind(); + GPU_buffers_unbind(); } static void cdDM_drawUVEdges(DerivedMesh *dm) @@ -389,7 +389,7 @@ static void cdDM_drawUVEdges(DerivedMesh *dm) if (prevdraw && (curpos != prevstart)) { glDrawArrays(GL_LINES, prevstart, curpos - prevstart); } - GPU_buffer_unbind(); + GPU_buffers_unbind(); } static void cdDM_drawEdges(DerivedMesh *dm, bool drawLooseEdges, bool drawAllEdges) @@ -418,7 +418,7 @@ static void cdDM_drawEdges(DerivedMesh *dm, bool drawLooseEdges, bool drawAllEdg GPU_buffer_draw_elements(gdo->edges, GL_LINES, gdo->loose_edge_offset * 2, dm->drawObject->tot_loose_edge_drawn * 2); } } - GPU_buffer_unbind(); + GPU_buffers_unbind(); } static void cdDM_drawLooseEdges(DerivedMesh *dm) @@ -435,7 +435,7 @@ static void cdDM_drawLooseEdges(DerivedMesh *dm) GPU_buffer_draw_elements(dm->drawObject->edges, GL_LINES, start, count); } - GPU_buffer_unbind(); + GPU_buffers_unbind(); } static void cdDM_drawFacesSolid( @@ -469,7 +469,7 @@ static void cdDM_drawFacesSolid( dm->drawObject->materials[a].start, dm->drawObject->materials[a].totelements); } } - GPU_buffer_unbind(); + GPU_buffers_unbind(); glShadeModel(GL_FLAT); } @@ -611,7 +611,7 @@ static void cdDM_drawFacesTex_common( } } - GPU_buffer_unbind(); + GPU_buffers_unbind(); glShadeModel(GL_FLAT); } @@ -790,7 +790,7 @@ static void cdDM_drawMappedFaces( glShadeModel(GL_FLAT); - GPU_buffer_unbind(); + GPU_buffers_unbind(); if (G.f & G_BACKBUFSEL) GPU_buffer_free(findex_buffer); @@ -1020,7 +1020,7 @@ static void cdDM_drawMappedFacesGLSL( } varray = GPU_buffer_lock_stream(buffer, GPU_BINDING_ARRAY); if (varray == NULL) { - GPU_buffer_unbind(); + GPU_buffers_unbind(); GPU_buffer_free(buffer); MEM_freeN(mat_orig_to_new); MEM_freeN(matconv); @@ -1090,7 +1090,7 @@ static void cdDM_drawMappedFacesGLSL( } } - GPU_buffer_unbind(); + GPU_buffers_unbind(); if (buffer) GPU_buffer_free(buffer); |