diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-12 15:07:37 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-12 15:08:03 +0300 |
commit | 76d0ab9750b04971fe7598011609faea2b4f7f62 (patch) | |
tree | f300e288f1d3de6970682cb4d5b291bf1308b615 /source/blender/gpu | |
parent | f1a14740bafc83bfd86774db4dfca2cbe8568cdc (diff) |
Code cleanup: fix various compiler warnings.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_uniformbuffer.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_uniformbuffer.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/gpu/GPU_uniformbuffer.h b/source/blender/gpu/GPU_uniformbuffer.h index e342078d8fd..57c4612c865 100644 --- a/source/blender/gpu/GPU_uniformbuffer.h +++ b/source/blender/gpu/GPU_uniformbuffer.h @@ -32,7 +32,6 @@ #ifndef __GPU_UNIFORMBUFFER_H__ #define __GPU_UNIFORMBUFFER_H__ -typedef enum GPUType GPUType; struct ListBase; typedef struct GPUUniformBuffer GPUUniformBuffer; diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c index e3072d729c3..9e786844270 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.c +++ b/source/blender/gpu/intern/gpu_uniformbuffer.c @@ -51,12 +51,12 @@ typedef enum GPUUniformBufferType { GPU_UBO_DYNAMIC = 1, } GPUUniformBufferType; -typedef struct GPUUniformBuffer { +struct GPUUniformBuffer { int size; /* in bytes */ GLuint bindcode; /* opengl identifier for UBO */ int bindpoint; /* current binding point */ GPUUniformBufferType type; -} GPUUniformBuffer; +}; #define GPUUniformBufferStatic GPUUniformBuffer @@ -67,12 +67,12 @@ typedef struct GPUUniformBufferDynamic { char flag; } GPUUniformBufferDynamic; -typedef struct GPUUniformBufferDynamicItem { +struct GPUUniformBufferDynamicItem { struct GPUUniformBufferDynamicItem *next, *prev; GPUType gputype; float *data; int size; -} GPUUniformBufferDynamicItem; +}; /* Prototypes */ |