archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OpenGL: use PRIM instead of GL enum everywhere else

Browse Source 
Well, everywhere that uses Gawain for drawing. Places that call OpenGL directly still use GL enums.

Part of T49043
This commit is contained in:
Mike Erwin
2017-04-08 00:50:36 -04:00
parent 1de61696fd
commit 0947c97fad
10 changed files with 91 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_compositing.c
View File

@@ -287,7 +287,7 @@ GPUFX *GPU_fx_compositor_create(void)
VertexBuffer_set_attrib(vbo, pos, i, fullscreencos[i]);
VertexBuffer_set_attrib(vbo, uvs, i, fullscreenuvs[i]);
}
fx->quad_batch = Batch_create(GL_TRIANGLE_STRIP, vbo, NULL);
fx->quad_batch = Batch_create(PRIM_TRIANGLE_STRIP, vbo, NULL);
/* Point Buffer */
static VertexFormat format_point = {0};
@@ -299,7 +299,7 @@ GPUFX *GPU_fx_compositor_create(void)
VertexBuffer *vbo_point = VertexBuffer_create_with_format(&format_point);
VertexBuffer_allocate_data(vbo_point, 1);
VertexBuffer_set_attrib(vbo_point, dummy_attrib, 0, &dummy);
fx->point_batch = Batch_create(GL_POINTS, vbo_point, NULL);
fx->point_batch = Batch_create(PRIM_POINTS, vbo_point, NULL);
return fx;
}