diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
commit | cd972535027a73ba70069051fe9038b6a8b5696a (patch) | |
tree | b50696bddbc710192b89e34fcdd1e82e6c8073b7 /source/blender/gpu | |
parent | aca76ddb502cbf0ee7888c3356f9f35240919410 (diff) |
- added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_buffers.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/GPU_extensions.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/GPU_material.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index 6f552e087d7..342cc6b72a3 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -121,7 +121,7 @@ typedef struct GPUAttrib int type; } GPUAttrib; -GPUBufferPool *GPU_buffer_pool_new(); +GPUBufferPool *GPU_buffer_pool_new(void); void GPU_buffer_pool_free( GPUBufferPool *pool ); void GPU_buffer_pool_free_unused( GPUBufferPool *pool ); @@ -171,7 +171,7 @@ void GPU_color_switch( int mode ); void GPU_buffer_draw_elements( GPUBuffer *elements, unsigned int mode, int start, int count ); /* called after drawing */ -void GPU_buffer_unbind(); +void GPU_buffer_unbind(void); int GPU_buffer_legacy( struct DerivedMesh *dm ); diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h index 96c68778201..14d951fe8bd 100644 --- a/source/blender/gpu/GPU_extensions.h +++ b/source/blender/gpu/GPU_extensions.h @@ -130,14 +130,14 @@ int GPU_texture_opengl_height(GPUTexture *tex); - after any of the GPU_framebuffer_* functions, GPU_framebuffer_restore must be called before rendering to the window framebuffer again */ -GPUFrameBuffer *GPU_framebuffer_create(); +GPUFrameBuffer *GPU_framebuffer_create(void); int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex); void GPU_framebuffer_texture_detach(GPUFrameBuffer *fb, GPUTexture *tex); void GPU_framebuffer_texture_bind(GPUFrameBuffer *fb, GPUTexture *tex); void GPU_framebuffer_texture_unbind(GPUFrameBuffer *fb, GPUTexture *tex); void GPU_framebuffer_free(GPUFrameBuffer *fb); -void GPU_framebuffer_restore(); +void GPU_framebuffer_restore(void); /* GPU OffScreen - wrapper around framebuffer and texture for simple offscreen drawing @@ -157,7 +157,7 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const void GPU_shader_free(GPUShader *shader); void GPU_shader_bind(GPUShader *shader); -void GPU_shader_unbind(); +void GPU_shader_unbind(GPUShader *shader); int GPU_shader_get_uniform(GPUShader *shader, char *name); void GPU_shader_uniform_vector(GPUShader *shader, int location, int length, diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index e0602c20272..23f13bccfc5 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -122,7 +122,7 @@ GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[4]); GPUMaterial *GPU_material_from_blender(struct Scene *scene, struct Material *ma); void GPU_material_free(struct Material *ma); -void GPU_materials_free(); +void GPU_materials_free(void); void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time, int mipmap); void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4]); diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index a3a42054cbc..e54002a85db 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -307,7 +307,7 @@ static void gpu_make_repbind(Image *ima) ima->repbind= MEM_callocN(sizeof(int)*ima->totbind, "repbind"); } -static void gpu_clear_tpage() +static void gpu_clear_tpage(void) { if(GTS.lasttface==0) return; diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index d147dd277e2..70cc6436702 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -1070,7 +1070,7 @@ void GPU_shader_bind(GPUShader *shader) GPU_print_error("Post Shader Bind"); } -void GPU_shader_unbind() +void GPU_shader_unbind(GPUShader *UNUSED(shader)) { GPU_print_error("Pre Shader Unbind"); glUseProgramObjectARB(0); diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index d7aa7c3377d..32754615bf0 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1294,7 +1294,7 @@ GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma) return mat; } -void GPU_materials_free() +void GPU_materials_free(void) { Object *ob; Material *ma; |