From 9b49a0d971c50d3316b8b752e6a9f35f67fd53c8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 9 Oct 2018 10:49:44 +1100 Subject: Cleanup: naming --- source/blender/editors/gpencil/drawgpencil.c | 76 +++++++++++++++------------- source/blender/gpu/GPU_immediate.h | 50 +++++++++--------- source/blender/gpu/intern/gpu_immediate.c | 72 +++++++++++++------------- 3 files changed, 103 insertions(+), 95 deletions(-) (limited to 'source') diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index be630d98ff1..51d33c0238e 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -114,11 +114,11 @@ typedef enum eDrawStrokeFlags { /* ----- Tool Buffer Drawing ------ */ /* helper functions to set color of buffer point */ -static void gp_set_tpoint_varying_color(const tGPspoint *pt, const float ink[4], uint attrib_id) +static void gp_set_tpoint_varying_color(const tGPspoint *pt, const float ink[4], uint attr_id) { float alpha = ink[3] * pt->strength; CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f); - immAttrib4ub(attrib_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha)); + immAttrib4ub(attr_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha)); } static void gp_set_point_uniform_color(const bGPDspoint *pt, const float ink[4]) @@ -128,11 +128,11 @@ static void gp_set_point_uniform_color(const bGPDspoint *pt, const float ink[4]) immUniformColor3fvAlpha(ink, alpha); } -static void gp_set_point_varying_color(const bGPDspoint *pt, const float ink[4], uint attrib_id) +static void gp_set_point_varying_color(const bGPDspoint *pt, const float ink[4], uint attr_id) { float alpha = ink[3] * pt->strength; CLAMP(alpha, GPENCIL_STRENGTH_MIN, 1.0f); - immAttrib4ub(attrib_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha)); + immAttrib4ub(attr_id, F2UB(ink[0]), F2UB(ink[1]), F2UB(ink[2]), F2UB(alpha)); } /* draw fills for buffer stroke */ @@ -736,9 +736,13 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 int cyclic_add = (cyclic) ? 1 : 0; GPUVertFormat *format = immVertexFormat(); - uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT); - uint color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT); - uint thickattrib = GPU_vertformat_attr_add(format, "thickness", GPU_COMP_F32, 1, GPU_FETCH_FLOAT); + const struct { + uint pos, color, thickness; + } attr_id = { + .pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT), + .color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT), + .thickness = GPU_vertformat_attr_add(format, "thickness", GPU_COMP_F32, 1, GPU_FETCH_FLOAT), + }; immBindBuiltinProgram(GPU_SHADER_GPENCIL_STROKE); immUniform2fv("Viewport", viewport); @@ -759,8 +763,8 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 for (int i = 0; i < totpoints; i++, pt++) { /* first point for adjacency (not drawn) */ if (i == 0) { - gp_set_point_varying_color(points, ink, color); - immAttrib1f(thickattrib, max_ff(curpressure * thickness, 1.0f)); + gp_set_point_varying_color(points, ink, attr_id.color); + immAttrib1f(attr_id.thickness, max_ff(curpressure * thickness, 1.0f)); if ((cyclic) && (totpoints > 2)) { mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + totpoints - 1)->x); } @@ -768,35 +772,35 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + 1)->x); } mul_v3_fl(fpt, -1.0f); - immVertex3fv(pos, fpt); + immVertex3fv(attr_id.pos, fpt); } /* set point */ - gp_set_point_varying_color(pt, ink, color); - immAttrib1f(thickattrib, max_ff(curpressure * thickness, 1.0f)); + gp_set_point_varying_color(pt, ink, attr_id.color); + immAttrib1f(attr_id.thickness, max_ff(curpressure * thickness, 1.0f)); mul_v3_m4v3(fpt, tgpw->diff_mat, &pt->x); - immVertex3fv(pos, fpt); + immVertex3fv(attr_id.pos, fpt); curpressure = pt->pressure; } if (cyclic && totpoints > 2) { /* draw line to first point to complete the cycle */ - immAttrib1f(thickattrib, max_ff(points->pressure * thickness, 1.0f)); + immAttrib1f(attr_id.thickness, max_ff(points->pressure * thickness, 1.0f)); mul_v3_m4v3(fpt, tgpw->diff_mat, &points->x); - immVertex3fv(pos, fpt); + immVertex3fv(attr_id.pos, fpt); /* now add adjacency point (not drawn) */ - immAttrib1f(thickattrib, max_ff((points + 1)->pressure * thickness, 1.0f)); + immAttrib1f(attr_id.thickness, max_ff((points + 1)->pressure * thickness, 1.0f)); mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + 1)->x); - immVertex3fv(pos, fpt); + immVertex3fv(attr_id.pos, fpt); } /* last adjacency point (not drawn) */ else { - gp_set_point_varying_color(points + totpoints - 1, ink, color); - immAttrib1f(thickattrib, max_ff(curpressure * thickness, 1.0f)); + gp_set_point_varying_color(points + totpoints - 1, ink, attr_id.color); + immAttrib1f(attr_id.thickness, max_ff(curpressure * thickness, 1.0f)); mul_v3_m4v3(fpt, tgpw->diff_mat, &(points + totpoints - 2)->x); mul_v3_fl(fpt, -1.0f); - immVertex3fv(pos, fpt); + immVertex3fv(attr_id.pos, fpt); } immEnd(); @@ -832,8 +836,12 @@ static void gp_draw_stroke_2d( float fpt[3]; GPUVertFormat *format = immVertexFormat(); - uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); - uint color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT); + const struct { + uint pos, color; + } attr_id = { + .pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT), + .color = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT), + }; immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR); immBegin(GPU_PRIM_TRI_STRIP, totpoints * 2 + 4); @@ -863,7 +871,7 @@ static void gp_draw_stroke_2d( pthick = (pt1->pressure * thickness * scalefac); /* color of point */ - gp_set_point_varying_color(pt1, ink, color); + gp_set_point_varying_color(pt1, ink, attr_id.color); /* if the first segment, start of segment is segment's normal */ if (i == 0) { @@ -881,8 +889,8 @@ static void gp_draw_stroke_2d( t1[1] = sc[1] + mt[1]; /* First two points of cap. */ - immVertex2fv(pos, t0); - immVertex2fv(pos, t1); + immVertex2fv(attr_id.pos, t0); + immVertex2fv(attr_id.pos, t1); /* calculate points for start of segment */ mt[0] = m2[0] * pthick; @@ -894,8 +902,8 @@ static void gp_draw_stroke_2d( t1[1] = s0[1] + mt[1]; /* Last two points of start cap (and first two points of first segment). */ - immVertex2fv(pos, t0); - immVertex2fv(pos, t1); + immVertex2fv(attr_id.pos, t0); + immVertex2fv(attr_id.pos, t1); } /* if not the first segment, use bisector of angle between segments */ else { @@ -928,8 +936,8 @@ static void gp_draw_stroke_2d( t1[1] = s0[1] + mt[1]; /* Last two points of previous segment, and first two points of current segment. */ - immVertex2fv(pos, t0); - immVertex2fv(pos, t1); + immVertex2fv(attr_id.pos, t0); + immVertex2fv(attr_id.pos, t1); } /* if last segment, also draw end of segment (defined as segment's normal) */ @@ -938,7 +946,7 @@ static void gp_draw_stroke_2d( pthick = (pt2->pressure * thickness * scalefac); /* color of point */ - gp_set_point_varying_color(pt2, ink, color); + gp_set_point_varying_color(pt2, ink, attr_id.color); /* calculate points for end of segment */ mt[0] = m2[0] * pthick; @@ -950,8 +958,8 @@ static void gp_draw_stroke_2d( t1[1] = s1[1] + mt[1]; /* Last two points of last segment (and first two points of end cap). */ - immVertex2fv(pos, t0); - immVertex2fv(pos, t1); + immVertex2fv(attr_id.pos, t0); + immVertex2fv(attr_id.pos, t1); /* draw end cap as last step * - make points slightly closer to center (about halfway across) @@ -967,8 +975,8 @@ static void gp_draw_stroke_2d( t1[1] = sc[1] + mt[1]; /* Last two points of end cap. */ - immVertex2fv(pos, t0); - immVertex2fv(pos, t1); + immVertex2fv(attr_id.pos, t0); + immVertex2fv(attr_id.pos, t1); } /* store computed point2 coordinates as point1 ones of next segment. */ diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index c8a4ea6a837..516f9e60d12 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -57,46 +57,46 @@ GPUBatch *immBeginBatchAtMost(GPUPrimType, uint vertex_len); /* Provide attribute values that can change per vertex. */ /* First vertex after immBegin must have all its attributes specified. */ -/* Skipped attributes will continue using the previous value for that attrib_id. */ -void immAttrib1f(uint attrib_id, float x); -void immAttrib2f(uint attrib_id, float x, float y); -void immAttrib3f(uint attrib_id, float x, float y, float z); -void immAttrib4f(uint attrib_id, float x, float y, float z, float w); +/* Skipped attributes will continue using the previous value for that attr_id. */ +void immAttrib1f(uint attr_id, float x); +void immAttrib2f(uint attr_id, float x, float y); +void immAttrib3f(uint attr_id, float x, float y, float z); +void immAttrib4f(uint attr_id, float x, float y, float z, float w); -void immAttrib2i(uint attrib_id, int x, int y); +void immAttrib2i(uint attr_id, int x, int y); -void immAttrib1u(uint attrib_id, uint x); +void immAttrib1u(uint attr_id, uint x); -void immAttrib2s(uint attrib_id, short x, short y); +void immAttrib2s(uint attr_id, short x, short y); -void immAttrib2fv(uint attrib_id, const float data[2]); -void immAttrib3fv(uint attrib_id, const float data[3]); -void immAttrib4fv(uint attrib_id, const float data[4]); +void immAttrib2fv(uint attr_id, const float data[2]); +void immAttrib3fv(uint attr_id, const float data[3]); +void immAttrib4fv(uint attr_id, const float data[4]); -void immAttrib3ub(uint attrib_id, unsigned char r, unsigned char g, unsigned char b); -void immAttrib4ub(uint attrib_id, unsigned char r, unsigned char g, unsigned char b, unsigned char a); +void immAttrib3ub(uint attr_id, unsigned char r, unsigned char g, unsigned char b); +void immAttrib4ub(uint attr_id, unsigned char r, unsigned char g, unsigned char b, unsigned char a); -void immAttrib3ubv(uint attrib_id, const unsigned char data[4]); -void immAttrib4ubv(uint attrib_id, const unsigned char data[4]); +void immAttrib3ubv(uint attr_id, const unsigned char data[4]); +void immAttrib4ubv(uint attr_id, const unsigned char data[4]); /* Explicitly skip an attribute. */ -/* This advanced option kills automatic value copying for this attrib_id. */ -void immSkipAttrib(uint attrib_id); +/* This advanced option kills automatic value copying for this attr_id. */ +void immSkipAttrib(uint attr_id); /* Provide one last attribute value & end the current vertex. */ /* This is most often used for 2D or 3D position (similar to glVertex). */ -void immVertex2f(uint attrib_id, float x, float y); -void immVertex3f(uint attrib_id, float x, float y, float z); -void immVertex4f(uint attrib_id, float x, float y, float z, float w); +void immVertex2f(uint attr_id, float x, float y); +void immVertex3f(uint attr_id, float x, float y, float z); +void immVertex4f(uint attr_id, float x, float y, float z, float w); -void immVertex2i(uint attrib_id, int x, int y); +void immVertex2i(uint attr_id, int x, int y); -void immVertex2s(uint attrib_id, short x, short y); +void immVertex2s(uint attr_id, short x, short y); -void immVertex2fv(uint attrib_id, const float data[2]); -void immVertex3fv(uint attrib_id, const float data[3]); +void immVertex2fv(uint attr_id, const float data[2]); +void immVertex3fv(uint attr_id, const float data[3]); -void immVertex2iv(uint attrib_id, const int data[2]); +void immVertex2iv(uint attr_id, const int data[2]); /* Provide uniform values that don't change for the entire draw call. */ void immUniform1i(const char *name, int x); diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index 6e3de51df6b..0f22dc8d258 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -414,17 +414,17 @@ static void setAttribValueBit(uint attrib_id) void immAttrib1f(uint attrib_id, float x) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_F32); - assert(attrib->comp_len == 1); + assert(attr->comp_type == GPU_COMP_F32); + assert(attr->comp_len == 1); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - float *data = (float *)(imm.vertex_data + attrib->offset); + float *data = (float *)(imm.vertex_data + attr->offset); /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm.buffer_data, data); */ data[0] = x; @@ -432,17 +432,17 @@ void immAttrib1f(uint attrib_id, float x) void immAttrib2f(uint attrib_id, float x, float y) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_F32); - assert(attrib->comp_len == 2); + assert(attr->comp_type == GPU_COMP_F32); + assert(attr->comp_len == 2); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - float *data = (float *)(imm.vertex_data + attrib->offset); + float *data = (float *)(imm.vertex_data + attr->offset); /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm.buffer_data, data); */ data[0] = x; @@ -451,17 +451,17 @@ void immAttrib2f(uint attrib_id, float x, float y) void immAttrib3f(uint attrib_id, float x, float y, float z) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_F32); - assert(attrib->comp_len == 3); + assert(attr->comp_type == GPU_COMP_F32); + assert(attr->comp_len == 3); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - float *data = (float *)(imm.vertex_data + attrib->offset); + float *data = (float *)(imm.vertex_data + attr->offset); /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm.buffer_data, data); */ data[0] = x; @@ -471,17 +471,17 @@ void immAttrib3f(uint attrib_id, float x, float y, float z) void immAttrib4f(uint attrib_id, float x, float y, float z, float w) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_F32); - assert(attrib->comp_len == 4); + assert(attr->comp_type == GPU_COMP_F32); + assert(attr->comp_len == 4); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - float *data = (float *)(imm.vertex_data + attrib->offset); + float *data = (float *)(imm.vertex_data + attr->offset); /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm.buffer_data, data); */ data[0] = x; @@ -492,34 +492,34 @@ void immAttrib4f(uint attrib_id, float x, float y, float z, float w) void immAttrib1u(uint attrib_id, uint x) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_U32); - assert(attrib->comp_len == 1); + assert(attr->comp_type == GPU_COMP_U32); + assert(attr->comp_len == 1); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - uint *data = (uint *)(imm.vertex_data + attrib->offset); + uint *data = (uint *)(imm.vertex_data + attr->offset); data[0] = x; } void immAttrib2i(uint attrib_id, int x, int y) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_I32); - assert(attrib->comp_len == 2); + assert(attr->comp_type == GPU_COMP_I32); + assert(attr->comp_len == 2); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - int *data = (int *)(imm.vertex_data + attrib->offset); + int *data = (int *)(imm.vertex_data + attr->offset); data[0] = x; data[1] = y; @@ -527,17 +527,17 @@ void immAttrib2i(uint attrib_id, int x, int y) void immAttrib2s(uint attrib_id, short x, short y) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_I16); - assert(attrib->comp_len == 2); + assert(attr->comp_type == GPU_COMP_I16); + assert(attr->comp_len == 2); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - short *data = (short *)(imm.vertex_data + attrib->offset); + short *data = (short *)(imm.vertex_data + attr->offset); data[0] = x; data[1] = y; @@ -560,17 +560,17 @@ void immAttrib4fv(uint attrib_id, const float data[4]) void immAttrib3ub(uint attrib_id, uchar r, uchar g, uchar b) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_U8); - assert(attrib->comp_len == 3); + assert(attr->comp_type == GPU_COMP_U8); + assert(attr->comp_len == 3); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - GLubyte *data = imm.vertex_data + attrib->offset; + GLubyte *data = imm.vertex_data + attr->offset; /* printf("%s %td %p\n", __FUNCTION__, data - imm.buffer_data, data); */ data[0] = r; @@ -580,17 +580,17 @@ void immAttrib3ub(uint attrib_id, uchar r, uchar g, uchar b) void immAttrib4ub(uint attrib_id, uchar r, uchar g, uchar b, uchar a) { - GPUVertAttr *attrib = imm.vertex_format.attribs + attrib_id; + GPUVertAttr *attr = imm.vertex_format.attribs + attrib_id; #if TRUST_NO_ONE assert(attrib_id < imm.vertex_format.attr_len); - assert(attrib->comp_type == GPU_COMP_U8); - assert(attrib->comp_len == 4); + assert(attr->comp_type == GPU_COMP_U8); + assert(attr->comp_len == 4); assert(imm.vertex_idx < imm.vertex_len); assert(imm.prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ #endif setAttribValueBit(attrib_id); - GLubyte *data = imm.vertex_data + attrib->offset; + GLubyte *data = imm.vertex_data + attr->offset; /* printf("%s %td %p\n", __FUNCTION__, data - imm.buffer_data, data); */ data[0] = r; -- cgit v1.2.3