diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-26 08:21:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-26 08:21:01 +0300 |
commit | 63dfb5bb97b1a320a0f5e51eaca51d7b25902aa4 (patch) | |
tree | c378ff70a431d4954c7e842af46a5642194efd23 /source/blender/gpu | |
parent | 86b81d25ea1ed696adc82ec39088e24f7a6422f0 (diff) |
Cleanup: naming (GPU immediate util)
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_immediate_util.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate_util.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.h index 31a90aa14b8..e225c0569ba 100644 --- a/source/blender/gpu/GPU_immediate_util.h +++ b/source/blender/gpu/GPU_immediate_util.h @@ -43,11 +43,11 @@ void imm_draw_disk_partial_fill_2d( uint pos, float x, float y, float radius_inner, float radius_outer, int nsegments, float start, float sweep); -void imm_draw_line_box_2d(uint pos, float x1, float y1, float x2, float y2); +void imm_draw_box_wire_2d(uint pos, float x1, float y1, float x2, float y2); -void imm_draw_line_box_3d(uint pos, float x1, float y1, float x2, float y2); +void imm_draw_box_wire_3d(uint pos, float x1, float y1, float x2, float y2); -void imm_draw_checker_box_2d(float x1, float y1, float x2, float y2); +void imm_draw_box_checker_2d(float x1, float y1, float x2, float y2); void imm_draw_cylinder_fill_normal_3d( uint pos, uint nor, float base, float top, float height, diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c index 5feb1c58cea..45230021435 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.c +++ b/source/blender/gpu/intern/gpu_immediate_util.c @@ -176,7 +176,7 @@ void imm_draw_circle_fill_3d(unsigned pos, float x, float y, float rad, int nseg * \param x2 right. * \param y2 top. */ -void imm_draw_line_box_2d(unsigned pos, float x1, float y1, float x2, float y2) +void imm_draw_box_wire_2d(unsigned pos, float x1, float y1, float x2, float y2) { immBegin(GWN_PRIM_LINE_LOOP, 4); immVertex2f(pos, x1, y1); @@ -186,7 +186,7 @@ void imm_draw_line_box_2d(unsigned pos, float x1, float y1, float x2, float y2) immEnd(); } -void imm_draw_line_box_3d(unsigned pos, float x1, float y1, float x2, float y2) +void imm_draw_box_wire_3d(unsigned pos, float x1, float y1, float x2, float y2) { /* use this version when Gwn_VertFormat has a vec3 position */ immBegin(GWN_PRIM_LINE_LOOP, 4); @@ -200,7 +200,7 @@ void imm_draw_line_box_3d(unsigned pos, float x1, float y1, float x2, float y2) /** * Draw a standard checkerboard to indicate transparent backgrounds. */ -void imm_draw_checker_box_2d(float x1, float y1, float x2, float y2) +void imm_draw_box_checker_2d(float x1, float y1, float x2, float y2) { unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_CHECKER); |