Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-05 03:45:23 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-06 08:18:12 +0300
commitc2f5cd8f6454bf8256a39a5fc9cb075311e25c58 (patch)
treec0c9f803f810c2be81c9b302d814ac4989a559ed /intern
parent957b408458140d1cfc72395d62189918bac5b5c7 (diff)
Gawain: add VertexBuffer prefix to functions
See intern/gawain for the API change. Other files are updated to use the new names.
Diffstat (limited to 'intern')
-rw-r--r--intern/gawain/gawain/vertex_buffer.h6
-rw-r--r--intern/gawain/src/vertex_buffer.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/intern/gawain/gawain/vertex_buffer.h b/intern/gawain/gawain/vertex_buffer.h
index 6a72cfe6ff3..687f15e9e98 100644
--- a/intern/gawain/gawain/vertex_buffer.h
+++ b/intern/gawain/gawain/vertex_buffer.h
@@ -46,9 +46,9 @@ void VertexBuffer_resize_data(VertexBuffer*, unsigned v_ct);
// to the vertex attribute's type and component count. They're in control of both, so this
// should not be a problem.
-void setAttrib(VertexBuffer*, unsigned a_idx, unsigned v_idx, const void* data);
-void fillAttrib(VertexBuffer*, unsigned a_idx, const void* data); // tightly packed, non interleaved input data
-void fillAttribStride(VertexBuffer*, unsigned a_idx, unsigned stride, const void* data);
+void VertexBuffer_set_attrib(VertexBuffer*, unsigned a_idx, unsigned v_idx, const void* data);
+void VertexBuffer_fill_attrib(VertexBuffer*, unsigned a_idx, const void* data); // tightly packed, non interleaved input data
+void VertexBuffer_fill_attrib_stride(VertexBuffer*, unsigned a_idx, unsigned stride, const void* data);
// TODO: decide whether to keep the functions below
// doesn't immediate mode satisfy these needs?
diff --git a/intern/gawain/src/vertex_buffer.c b/intern/gawain/src/vertex_buffer.c
index 827703403e3..ab488a07bed 100644
--- a/intern/gawain/src/vertex_buffer.c
+++ b/intern/gawain/src/vertex_buffer.c
@@ -92,7 +92,7 @@ void VertexBuffer_resize_data(VertexBuffer* verts, unsigned v_ct)
// extra space will be reclaimed, and never sent to VRAM (see VertexBuffer_prime)
}
-void setAttrib(VertexBuffer* verts, unsigned a_idx, unsigned v_idx, const void* data)
+void VertexBuffer_set_attrib(VertexBuffer* verts, unsigned a_idx, unsigned v_idx, const void* data)
{
const VertexFormat* format = &verts->format;
const Attrib* a = format->attribs + a_idx;
@@ -106,7 +106,7 @@ void setAttrib(VertexBuffer* verts, unsigned a_idx, unsigned v_idx, const void*
memcpy((GLubyte*)verts->data + a->offset + v_idx * format->stride, data, a->sz);
}
-void fillAttrib(VertexBuffer* verts, unsigned a_idx, const void* data)
+void VertexBuffer_fill_attrib(VertexBuffer* verts, unsigned a_idx, const void* data)
{
const VertexFormat* format = &verts->format;
const Attrib* a = format->attribs + a_idx;
@@ -117,10 +117,10 @@ void fillAttrib(VertexBuffer* verts, unsigned a_idx, const void* data)
const unsigned stride = a->sz; // tightly packed input data
- fillAttribStride(verts, a_idx, stride, data);
+ VertexBuffer_fill_attrib_stride(verts, a_idx, stride, data);
}
-void fillAttribStride(VertexBuffer* verts, unsigned a_idx, unsigned stride, const void* data)
+void VertexBuffer_fill_attrib_stride(VertexBuffer* verts, unsigned a_idx, unsigned stride, const void* data)
{
const VertexFormat* format = &verts->format;
const Attrib* a = format->attribs + a_idx;