griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU Buffers

Browse Source 
Small type cleanup, use `GPU_Buffers *' rather than `void *'. Should
be no functional changes.
This commit is contained in:
Nicholas Bishop
2011-11-05 03:29:37 +00:00
parent cc7e79f372
commit a71e2c498c
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/intern/pbvh.c
View File

@@ -80,7 +80,7 @@ typedef struct {
struct PBVHNode {
/* Opaque handle for drawing code */
void *draw_buffers;
GPU_Buffers *draw_buffers;
/* Voxel bounds */
BB vb;

13
source/blender/gpu/GPU_buffers.h
View File

@@ -161,17 +161,18 @@ void GPU_buffer_unbind(void);
int GPU_buffer_legacy( struct DerivedMesh *dm );
/* Buffers for non-DerivedMesh drawing */
void *GPU_build_mesh_buffers(struct GHash *map, struct MVert *mvert,
typedef struct GPU_Buffers GPU_Buffers;
GPU_Buffers *GPU_build_mesh_buffers(struct GHash *map, struct MVert *mvert,
struct MFace *mface, int *face_indices,
int totface, int *vert_indices, int uniq_verts,
int totvert);
void GPU_update_mesh_buffers(void *buffers, struct MVert *mvert,
void GPU_update_mesh_buffers(GPU_Buffers *buffers, struct MVert *mvert,
int *vert_indices, int totvert);
void *GPU_build_grid_buffers(struct DMGridData **grids,
GPU_Buffers *GPU_build_grid_buffers(struct DMGridData **grids,
int *grid_indices, int totgrid, int gridsize);
void GPU_update_grid_buffers(void *buffers_v, struct DMGridData **grids,
void GPU_update_grid_buffers(GPU_Buffers *buffers_v, struct DMGridData **grids,
int *grid_indices, int totgrid, int gridsize, int smooth);
void GPU_draw_buffers(void *buffers);
void GPU_free_buffers(void *buffers);
void GPU_draw_buffers(GPU_Buffers *buffers);
void GPU_free_buffers(GPU_Buffers *buffers);
#endif

16
source/blender/gpu/intern/gpu_buffers.c
View File

@@ -1279,7 +1279,7 @@ typedef struct {
short no[3];
} VertexBufferFormat;
typedef struct {
struct GPU_Buffers {
/* opengl buffer handles */
GLuint vert_buf, index_buf;
GLenum index_type;
@@ -1297,9 +1297,9 @@ typedef struct {
int gridsize;
unsigned int tot_tri, tot_quad;
} GPU_Buffers;
};
void GPU_update_mesh_buffers(void *buffers_v, MVert *mvert,
void GPU_update_mesh_buffers(GPU_Buffers *buffers_v, MVert *mvert,
int *vert_indices, int totvert)
{
GPU_Buffers *buffers = buffers_v;
@@ -1336,7 +1336,7 @@ void GPU_update_mesh_buffers(void *buffers_v, MVert *mvert,
buffers->mvert = mvert;
}
void *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface,
GPU_Buffers *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface,
int *face_indices, int totface,
int *vert_indices, int tot_uniq_verts,
int totvert)
@@ -1416,7 +1416,7 @@ void *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface,
return buffers;
}
void GPU_update_grid_buffers(void *buffers_v, DMGridData **grids,
void GPU_update_grid_buffers(GPU_Buffers *buffers_v, DMGridData **grids,
int *grid_indices, int totgrid, int gridsize, int smooth)
{
GPU_Buffers *buffers = buffers_v;
@@ -1471,7 +1471,7 @@ void GPU_update_grid_buffers(void *buffers_v, DMGridData **grids,
//printf("node updated %p\n", buffers_v);
}
void *GPU_build_grid_buffers(DMGridData **UNUSED(grids), int *UNUSED(grid_indices),
GPU_Buffers *GPU_build_grid_buffers(DMGridData **UNUSED(grids), int *UNUSED(grid_indices),
int totgrid, int gridsize)
{
GPU_Buffers *buffers;
@@ -1561,7 +1561,7 @@ void *GPU_build_grid_buffers(DMGridData **UNUSED(grids), int *UNUSED(grid_indice
return buffers;
}
void GPU_draw_buffers(void *buffers_v)
void GPU_draw_buffers(GPU_Buffers *buffers_v)
{
GPU_Buffers *buffers = buffers_v;
@@ -1635,7 +1635,7 @@ void GPU_draw_buffers(void *buffers_v)
}
}
void GPU_free_buffers(void *buffers_v)
void GPU_free_buffers(GPU_Buffers *buffers_v)
{
if(buffers_v) {
GPU_Buffers *buffers = buffers_v;