Commit: 2aef1347f933720fd1053e2e0f20a37bdb24e169
Author: Campbell Barton
Date: Sun Aug 18 04:11:41 2019 +1000
Branches: master
https://developer.blender.org/rB2aef1347f933720fd1053e2e0f20a37bdb24e169
Cleanup: correct comments
===================================================================
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_camera_control.c
===================================================================
diff --git a/source/blender/draw/intern/draw_instance_data.c
b/source/blender/draw/intern/draw_instance_data.c
index 802f49d6549..8f26cc72a02 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -23,7 +23,7 @@
/**
* DRW Instance Data Manager
* This is a special memory manager that keeps memory blocks ready to send as
vbo data in one
- * continuous allocation. This way we avoid feeding gawain each instance data
one by one and
+ * continuous allocation. This way we avoid feeding #GPUBatch each instance
data one by one and
* unnecessary memcpy. Since we loose which memory block was used each
#DRWShadingGroup we need to
* redistribute them in the same order/size to avoid to realloc each frame.
This is why
* #DRWInstanceDatas are sorted in a list for each different data size.
diff --git a/source/blender/draw/intern/draw_manager.c
b/source/blender/draw/intern/draw_manager.c
index f758dedd09f..288f291561e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2923,7 +2923,7 @@ void DRW_opengl_context_create(void)
/* This changes the active context. */
DST.gl_context = WM_opengl_context_create();
WM_opengl_context_activate(DST.gl_context);
- /* Be sure to create gawain.context too. */
+ /* Be sure to create gpu_context too. */
DST.gpu_context = GPU_context_create(0);
if (!G.background) {
immActivate();
diff --git a/source/blender/draw/intern/draw_manager_exec.c
b/source/blender/draw/intern/draw_manager_exec.c
index 3bf442b4f39..09bf12dba7b 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -622,12 +622,12 @@ BLI_INLINE void draw_geometry_execute(DRWShadingGroup
*shgroup,
GPU_batch_bind(geom);
}
- /* XXX hacking gawain. we don't want to call glUseProgram! (huge performance
loss) */
+ /* XXX hacking #GPUBatch. we don't want to call glUseProgram! (huge
performance loss) */
geom->program_in_use = true;
GPU_batch_draw_advanced(geom, vert_first, vert_count, inst_first,
inst_count);
- geom->program_in_use = false; /* XXX hacking gawain */
+ geom->program_in_use = false; /* XXX hacking #GPUBatch */
}
enum {
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 38e8d285c77..b412a72cce1 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -145,7 +145,7 @@ void ED_draw_object_facemap(Depsgraph *depsgraph,
facemap_data = CustomData_get_layer(&me->pdata, CD_FACEMAP);
- /* use gawain immediate mode fore now */
+ /* Make a batch and free it each time for now. */
const int looptris_len = poly_to_tri_count(mpoly_len, mloop_len);
const int vbo_len_capacity = looptris_len * 3;
int vbo_len_used = 0;
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c
b/source/blender/editors/space_view3d/view3d_camera_control.c
index 0045094542f..f8f97848d14 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -87,8 +87,7 @@ typedef struct View3DCameraControl {
float ofs_backup[3];
/* backup the views offset in case the user cancels flying in non camera
mode */
- /* backup the views quat in case the user cancels flying in non camera mode.
- * (quat for view, eul for camera) */
+ /* backup the views quat in case the user cancels flying in non camera mode.
*/
float rot_backup[4];
/* remember if were ortho or not, only used for restoring the view if it was
a ortho view */
char persp_backup;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
