diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-04-06 07:59:04 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-06 08:18:12 +0300 |
commit | 0debbe2b7f7177678c9bce9046c1499b698ac969 (patch) | |
tree | 9a1fb242aae9be44b3479d2a747411b6e0c04822 /source/blender/gpu | |
parent | c2f5cd8f6454bf8256a39a5fc9cb075311e25c58 (diff) |
Gawain: VertexFormat_add_attrib (function name change)
See intern/gawain for the API change. Other files are updated to use the new name. Also updated every call site to the recommended style:
unsigned int foo = VertexFormat_add_attrib(format, "foo", COMP_ ... )
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_batch.c | 8 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_compositing.c | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate_util.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c index 0e4b71ab9b8..dd8b6172483 100644 --- a/source/blender/gpu/intern/gpu_batch.c +++ b/source/blender/gpu/intern/gpu_batch.c @@ -67,8 +67,8 @@ static Batch *batch_sphere(int lat_res, int lon_res) float lon, lat; if (format.attrib_ct == 0) { - pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT); - nor_id = add_attrib(&format, "nor", GL_FLOAT, 3, KEEP_FLOAT); + pos_id = VertexFormat_add_attrib(&format, "pos", COMP_F32, 3, KEEP_FLOAT); + nor_id = VertexFormat_add_attrib(&format, "nor", COMP_F32, 3, KEEP_FLOAT); } vbo = VertexBuffer_create_with_format(&format); @@ -103,8 +103,8 @@ static Batch *batch_sphere_wire(int lat_res, int lon_res) float lon, lat; if (format.attrib_ct == 0) { - pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT); - nor_id = add_attrib(&format, "nor", GL_FLOAT, 3, KEEP_FLOAT); + pos_id = VertexFormat_add_attrib(&format, "pos", COMP_F32, 3, KEEP_FLOAT); + nor_id = VertexFormat_add_attrib(&format, "nor", COMP_F32, 3, KEEP_FLOAT); } vbo = VertexBuffer_create_with_format(&format); diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c index e4647c33621..8ee22ce1c13 100644 --- a/source/blender/gpu/intern/gpu_compositing.c +++ b/source/blender/gpu/intern/gpu_compositing.c @@ -278,8 +278,8 @@ GPUFX *GPU_fx_compositor_create(void) static VertexFormat format = {0}; static unsigned int pos, uvs; if (format.attrib_ct == 0) { - pos = add_attrib(&format, "pos", GL_FLOAT, 2, KEEP_FLOAT); - uvs = add_attrib(&format, "uvs", GL_FLOAT, 2, KEEP_FLOAT); + pos = VertexFormat_add_attrib(&format, "pos", COMP_F32, 2, KEEP_FLOAT); + uvs = VertexFormat_add_attrib(&format, "uvs", COMP_F32, 2, KEEP_FLOAT); } VertexBuffer *vbo = VertexBuffer_create_with_format(&format); VertexBuffer_allocate_data(vbo, 4); @@ -293,7 +293,7 @@ GPUFX *GPU_fx_compositor_create(void) static VertexFormat format_point = {0}; static unsigned int dummy_attrib; if (format_point.attrib_ct == 0) { - dummy_attrib = add_attrib(&format_point, "pos", GL_FLOAT, 2, KEEP_FLOAT); + dummy_attrib = VertexFormat_add_attrib(&format_point, "pos", COMP_F32, 2, KEEP_FLOAT); } float dummy[2] = {0.0f, 0.0f}; VertexBuffer *vbo_point = VertexBuffer_create_with_format(&format_point); diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index afc04ac8626..425fcecae0c 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -390,8 +390,8 @@ void GPU_framebuffer_blur( if (format.attrib_ct == 0) { unsigned int i = 0; /* Vertex format */ - unsigned int pos = add_attrib(&format, "pos", GL_FLOAT, 2, KEEP_FLOAT); - unsigned int uvs = add_attrib(&format, "uvs", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(&format, "pos", COMP_F32, 2, KEEP_FLOAT); + unsigned int uvs = VertexFormat_add_attrib(&format, "uvs", COMP_F32, 2, KEEP_FLOAT); /* Vertices */ VertexBuffer_init_with_format(&vbo, &format); diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c index cc874acbe52..1d9b58bfaa5 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.c +++ b/source/blender/gpu/intern/gpu_immediate_util.c @@ -186,7 +186,7 @@ void imm_draw_line_box_3d(unsigned pos, float x1, float y1, float x2, float y2) */ void imm_draw_checker_box(float x1, float y1, float x2, float y2) { - unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_CHECKER); immUniform4f("color1", 0.15f, 0.15f, 0.15f, 1.0f); diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index bcfe4f38f3e..3aea6f8bea4 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -251,8 +251,8 @@ static void draw_ofs_to_screen(GPUViewport *viewport) const float h = (float)GPU_texture_height(color); VertexFormat *format = immVertexFormat(); - unsigned texcoord = add_attrib(format, "texCoord", GL_FLOAT, 2, KEEP_FLOAT); - unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int texcoord = VertexFormat_add_attrib(format, "texCoord", COMP_F32, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_IMAGE_MODULATE_ALPHA); GPU_texture_bind(color, 0); @@ -381,8 +381,8 @@ void GPU_viewport_debug_depth_draw(GPUViewport *viewport, const float znear, con const float h = (float)GPU_texture_height(viewport->debug_depth); VertexFormat *format = immVertexFormat(); - unsigned texcoord = add_attrib(format, "texCoord", GL_FLOAT, 2, KEEP_FLOAT); - unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int texcoord = VertexFormat_add_attrib(format, "texCoord", COMP_F32, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_IMAGE_DEPTH); |