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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_batch.c4
-rw-r--r--source/blender/gpu/intern/gpu_compositing.c6
-rw-r--r--source/blender/gpu/intern/gpu_framebuffer.c6
3 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 65a827febde..0e4b71ab9b8 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -55,8 +55,8 @@ static void batch_sphere_lat_lon_vert(float lat, float lon)
pos[1] = cosf(lat);
pos[2] = sinf(lat) * sinf(lon);
- setAttrib(vbo, nor_id, vert, pos);
- setAttrib(vbo, pos_id, vert++, pos);
+ VertexBuffer_set_attrib(vbo, nor_id, vert, pos);
+ VertexBuffer_set_attrib(vbo, pos_id, vert++, pos);
}
/* Replacement for gluSphere */
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index 8ae100a7d95..e4647c33621 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -284,8 +284,8 @@ GPUFX *GPU_fx_compositor_create(void)
VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
VertexBuffer_allocate_data(vbo, 4);
for (int i = 0; i < 4; ++i) {
- setAttrib(vbo, pos, i, fullscreencos[i]);
- setAttrib(vbo, uvs, i, fullscreenuvs[i]);
+ VertexBuffer_set_attrib(vbo, pos, i, fullscreencos[i]);
+ VertexBuffer_set_attrib(vbo, uvs, i, fullscreenuvs[i]);
}
fx->quad_batch = Batch_create(GL_TRIANGLE_STRIP, vbo, NULL);
@@ -298,7 +298,7 @@ GPUFX *GPU_fx_compositor_create(void)
float dummy[2] = {0.0f, 0.0f};
VertexBuffer *vbo_point = VertexBuffer_create_with_format(&format_point);
VertexBuffer_allocate_data(vbo_point, 1);
- setAttrib(vbo_point, dummy_attrib, 0, &dummy);
+ VertexBuffer_set_attrib(vbo_point, dummy_attrib, 0, &dummy);
fx->point_batch = Batch_create(GL_POINTS, vbo_point, NULL);
return fx;
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index c6a98d01c02..afc04ac8626 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -398,10 +398,12 @@ void GPU_framebuffer_blur(
VertexBuffer_allocate_data(&vbo, 36);
for (int j = 0; j < 3; ++j) {
- setAttrib(&vbo, uvs, i, fullscreenuvs[j]); setAttrib(&vbo, pos, i++, fullscreencos[j]);
+ VertexBuffer_set_attrib(&vbo, uvs, i, fullscreenuvs[j]);
+ VertexBuffer_set_attrib(&vbo, pos, i++, fullscreencos[j]);
}
for (int j = 1; j < 4; ++j) {
- setAttrib(&vbo, uvs, i, fullscreenuvs[j]); setAttrib(&vbo, pos, i++, fullscreencos[j]);
+ VertexBuffer_set_attrib(&vbo, uvs, i, fullscreenuvs[j]);
+ VertexBuffer_set_attrib(&vbo, pos, i++, fullscreencos[j]);
}
Batch_init(&batch, GL_TRIANGLES, &vbo, NULL);