[Bf-blender-cvs] [0947c97fade] blender2.8: OpenGL: use PRIM instead of GL enum everywhere else
Mike Erwin
noreply at git.blender.org
Sat Apr 8 07:32:17 CEST 2017
Commit: 0947c97fade7a5400e22d85b1f61c5a0f552976a
Author: Mike Erwin
Date: Sat Apr 8 00:50:36 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB0947c97fade7a5400e22d85b1f61c5a0f552976a
OpenGL: use PRIM instead of GL enum everywhere else
Well, everywhere that uses Gawain for drawing. Places that call OpenGL directly still use GL enums.
Part of T49043
===================================================================
M source/blender/blenkernel/intern/mesh_render.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/gpu/intern/gpu_batch.c
M source/blender/gpu/intern/gpu_compositing.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_render.c b/source/blender/blenkernel/intern/mesh_render.c
index cde412e3ae5..c1495ab325b 100644
--- a/source/blender/blenkernel/intern/mesh_render.c
+++ b/source/blender/blenkernel/intern/mesh_render.c
@@ -971,7 +971,7 @@ static ElementList *mesh_batch_cache_get_edges_in_order(MeshRenderData *mrdata,
const int edge_ct = mesh_render_data_edges_num_get(mrdata);
ElementListBuilder elb;
- ElementListBuilder_init(&elb, GL_LINES, edge_ct, vertex_ct);
+ ElementListBuilder_init(&elb, PRIM_LINES, edge_ct, vertex_ct);
for (int i = 0; i < edge_ct; ++i) {
int vert_idx[2];
mesh_render_data_edge_verts_indices_get(mrdata, i, vert_idx);
@@ -992,7 +992,7 @@ static ElementList *mesh_batch_cache_get_triangles_in_order(MeshRenderData *mrda
const int tri_ct = mesh_render_data_looptri_num_get(mrdata);
ElementListBuilder elb;
- ElementListBuilder_init(&elb, GL_TRIANGLES, tri_ct, vertex_ct);
+ ElementListBuilder_init(&elb, PRIM_TRIANGLES, tri_ct, vertex_ct);
for (int i = 0; i < tri_ct; ++i) {
int tri_vert_idx[3];
mesh_render_data_looptri_verts_indices_get(mrdata, i, tri_vert_idx);
@@ -1013,7 +1013,7 @@ Batch *BKE_mesh_batch_cache_get_all_edges(Mesh *me)
/* create batch from Mesh */
MeshRenderData *mrdata = mesh_render_data_create(me, MR_DATATYPE_VERT | MR_DATATYPE_EDGE);
- cache->all_edges = Batch_create(GL_LINES, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache),
+ cache->all_edges = Batch_create(PRIM_LINES, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache),
mesh_batch_cache_get_edges_in_order(mrdata, cache));
mesh_render_data_free(mrdata);
@@ -1030,7 +1030,7 @@ Batch *BKE_mesh_batch_cache_get_all_triangles(Mesh *me)
/* create batch from DM */
MeshRenderData *mrdata = mesh_render_data_create(me, MR_DATATYPE_VERT | MR_DATATYPE_LOOPTRI);
- cache->all_triangles = Batch_create(GL_TRIANGLES, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache),
+ cache->all_triangles = Batch_create(PRIM_TRIANGLES, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache),
mesh_batch_cache_get_triangles_in_order(mrdata, cache));
mesh_render_data_free(mrdata);
@@ -1046,7 +1046,7 @@ Batch *BKE_mesh_batch_cache_get_triangles_with_normals(Mesh *me)
if (cache->triangles_with_normals == NULL) {
MeshRenderData *mrdata = mesh_render_data_create(me, MR_DATATYPE_VERT | MR_DATATYPE_LOOPTRI | MR_DATATYPE_LOOP | MR_DATATYPE_POLY);
- cache->triangles_with_normals = Batch_create(GL_TRIANGLES, mesh_batch_cache_get_pos_and_normals(mrdata, cache), NULL);
+ cache->triangles_with_normals = Batch_create(PRIM_TRIANGLES, mesh_batch_cache_get_pos_and_normals(mrdata, cache), NULL);
mesh_render_data_free(mrdata);
}
@@ -1061,7 +1061,7 @@ Batch *BKE_mesh_batch_cache_get_points_with_normals(Mesh *me)
if (cache->points_with_normals == NULL) {
MeshRenderData *mrdata = mesh_render_data_create(me, MR_DATATYPE_VERT | MR_DATATYPE_LOOPTRI | MR_DATATYPE_LOOP | MR_DATATYPE_POLY);
- cache->points_with_normals = Batch_create(GL_POINTS, mesh_batch_cache_get_pos_and_normals(mrdata, cache), NULL);
+ cache->points_with_normals = Batch_create(PRIM_POINTS, mesh_batch_cache_get_pos_and_normals(mrdata, cache), NULL);
mesh_render_data_free(mrdata);
}
@@ -1077,7 +1077,7 @@ Batch *BKE_mesh_batch_cache_get_all_verts(Mesh *me)
/* create batch from DM */
MeshRenderData *mrdata = mesh_render_data_create(me, MR_DATATYPE_VERT);
- cache->all_verts = Batch_create(GL_POINTS, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache), NULL);
+ cache->all_verts = Batch_create(PRIM_POINTS, mesh_batch_cache_get_pos_and_nor_in_order(mrdata, cache), NULL);
mesh_render_data_free(mrdata);
}
@@ -1111,7 +1111,7 @@ Batch *BKE_mesh_batch_cache_get_fancy_edges(Mesh *me)
const int edge_ct = mesh_render_data_edges_num_get(mrdata);
- const int vertex_ct = edge_ct * 2; /* these are GL_LINE verts, not mesh verts */
+ const int vertex_ct = edge_ct * 2; /* these are PRIM_LINE verts, not mesh verts */
VertexBuffer_allocate_data(vbo, vertex_ct);
for (int i = 0; i < edge_ct; ++i) {
float *vcos1, *vcos2;
@@ -1146,7 +1146,7 @@ Batch *BKE_mesh_batch_cache_get_fancy_edges(Mesh *me)
VertexBuffer_set_attrib(vbo, n2_id, 2 * i + 1, n2);
}
- cache->fancy_edges = Batch_create(GL_LINES, vbo, NULL);
+ cache->fancy_edges = Batch_create(PRIM_LINES, vbo, NULL);
mesh_render_data_free(mrdata);
}
@@ -1187,7 +1187,7 @@ static void mesh_batch_cache_create_overlay_batches(Mesh *me)
gpu_vert_idx += 3;
}
- cache->overlay_triangles = Batch_create(GL_TRIANGLES, vbo, NULL);
+ cache->overlay_triangles = Batch_create(PRIM_TRIANGLES, vbo, NULL);
}
if (cache->overlay_loose_edges == NULL) {
@@ -1202,7 +1202,7 @@ static void mesh_batch_cache_create_overlay_batches(Mesh *me)
vert_idx[0], vert_idx[1], mrdata->loose_edges[i], gpu_vert_idx);
gpu_vert_idx += 2;
}
- cache->overlay_loose_edges = Batch_create(GL_LINES, vbo, NULL);
+ cache->overlay_loose_edges = Batch_create(PRIM_LINES, vbo, NULL);
}
if (cache->overlay_loose_verts == NULL) {
@@ -1215,7 +1215,7 @@ static void mesh_batch_cache_create_overlay_batches(Mesh *me)
mrdata->loose_verts[i], gpu_vert_idx);
gpu_vert_idx += 1;
}
- cache->overlay_loose_verts = Batch_create(GL_POINTS, vbo, NULL);
+ cache->overlay_loose_verts = Batch_create(PRIM_POINTS, vbo, NULL);
}
mesh_render_data_free(mrdata);
@@ -1297,7 +1297,7 @@ Batch *BKE_mesh_batch_cache_get_overlay_facedots(Mesh *me)
VertexBuffer_set_attrib(vbo, pos_id, i, pcenter);
}
- cache->overlay_facedots = Batch_create(GL_POINTS, vbo, NULL);
+ cache->overlay_facedots = Batch_create(PRIM_POINTS, vbo, NULL);
mesh_render_data_free(mrdata);
}
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index e8d2f1b83fe..892df42072d 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -270,7 +270,7 @@ Batch *DRW_cache_fullscreen_quad_get(void)
VertexBuffer_set_attrib(vbo, uvs_id, i, uvs[i]);
}
- SHC.drw_fullscreen_quad = Batch_create(GL_TRIANGLE_STRIP, vbo, NULL);
+ SHC.drw_fullscreen_quad = Batch_create(PRIM_TRIANGLE_STRIP, vbo, NULL);
}
return SHC.drw_fullscreen_quad;
}
@@ -307,7 +307,7 @@ Batch *DRW_cache_cube_get(void)
VertexBuffer_set_attrib(vbo, pos_id, i, verts[indices[i]]);
}
- SHC.drw_cube = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_cube = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_cube;
}
@@ -340,7 +340,7 @@ Batch *DRW_cache_circle_get(void)
VertexBuffer_set_attrib(vbo, pos_id, a * 2 + 1, v);
}
- SHC.drw_circle = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_circle = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_circle;
#undef CIRCLE_RESOL
@@ -369,7 +369,7 @@ Batch *DRW_cache_square_get(void)
VertexBuffer_set_attrib(vbo, pos_id, i * 2 + 1, p[(i+1) % 4]);
}
- SHC.drw_square = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_square = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_square;
}
@@ -394,7 +394,7 @@ Batch *DRW_cache_single_line_get(void)
VertexBuffer_set_attrib(vbo, pos_id, 0, v1);
VertexBuffer_set_attrib(vbo, pos_id, 1, v2);
- SHC.drw_line = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_line = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_line;
}
@@ -420,7 +420,7 @@ Batch *DRW_cache_single_line_endpoints_get(void)
VertexBuffer_set_attrib(vbo, pos_id, 0, v1);
VertexBuffer_set_attrib(vbo, pos_id, 1, v2);
- SHC.drw_line_endpoints = Batch_create(GL_POINTS, vbo, NULL);
+ SHC.drw_line_endpoints = Batch_create(PRIM_POINTS, vbo, NULL);
}
return SHC.drw_line_endpoints;
}
@@ -454,7 +454,7 @@ Batch *DRW_cache_plain_axes_get(void)
v1[axis] = v2[axis] = 0.0f;
}
- SHC.drw_plain_axes = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_plain_axes = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_plain_axes;
}
@@ -494,7 +494,7 @@ Batch *DRW_cache_single_arrow_get(void)
VertexBuffer_set_attrib(vbo, pos_id, sides * 3 + 2, v3);
}
- SHC.drw_single_arrow = Batch_create(GL_TRIANGLES, vbo, NULL);
+ SHC.drw_single_arrow = Batch_create(PRIM_TRIANGLES, vbo, NULL);
}
return SHC.drw_single_arrow;
}
@@ -503,7 +503,7 @@ Batch *DRW_cache_empty_sphere_get(void)
{
if (!SHC.drw_empty_sphere) {
VertexBuffer *vbo = sphere_wire_vbo(1.0f);
- SHC.drw_empty_sphere = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_empty_sphere = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_empty_sphere;
}
@@ -550,7 +550,7 @@ Batch *DRW_cache_empty_cone_get(void)
VertexBuffer_set_attrib(vbo, pos_id, i * 4 + 3, v);
}
- SHC.drw_empty_cone = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_empty_cone = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_empty_cone;
#undef NSEGMENTS
@@ -561,7 +561,7 @@ Batch *DRW_cache_arrows_get(void)
if (!SHC.drw_arrows) {
VertexBuffer *vbo = fill_arrows_vbo(1.0f);
- SHC.drw_arrows = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_arrows = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_arrows;
}
@@ -622,7 +622,7 @@ Batch *DRW_cache_axis_names_get(void)
VertexBuffer_set_attrib(vbo, pos_id, 12, v1);
VertexBuffer_set_attrib(vbo, pos_id, 13, v2);
- SHC.drw_axis_names = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_axis_names = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_axis_names;
}
@@ -654,7 +654,7 @@ Batch *DRW_cache_lamp_get(void)
VertexBuffer_set_attrib(vbo, pos_id, a * 2 + 1, v);
}
- SHC.drw_lamp = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_lamp = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_lamp;
#undef NSEGMENTS
@@ -686,7 +686,7 @@ Batch *DRW_cache_lamp_sunrays_get(void)
VertexBuffer_set_attrib(vbo, pos_id, a * 2 + 1, v2);
}
- SHC.drw_lamp_sunrays = Batch_create(GL_LINES, vbo, NULL);
+ SHC.drw_lamp_sunrays = Batch_create(PRIM_LINES, vbo, NULL);
}
return SHC.drw_lamp_sunrays;
}
@@ -720,7 +720,7 @@ Batch *DRW_cache_lamp_area_get(void)
v1[1] = 0.5f;
Vertex
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list