diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 20:56:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 20:56:23 +0400 |
| commit | 39ca3146ff3b52677cbff4d4e58ca23c88e18628 (patch) | |
| tree | 24444ce6f02e1cbeda727a2a1c1ae224ad973896 /source/blender/gpu | |
| parent | 69a7e0af02a680f188891a3a2bac86b74f2fbd61 (diff) | |
fix for some build warnings.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 04764b07315..c59b80675ea 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -632,12 +632,12 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int void GPU_create_gl_tex(unsigned int *bind, unsigned int *pix, float * frect, int rectw, int recth, int mipmap, int use_high_bit_depth, Image *ima) { unsigned int *scalerect = NULL; - float *fscalerect = NULL; - - int tpx = rectw; - int tpy = recth; - - /* scale if not a power of two. this is not strictly necessary for newer + float *fscalerect = NULL; + + int tpx = rectw; + int tpy = recth; + + /* scale if not a power of two. this is not strictly necessary for newer * GPUs (OpenGL version >= 2.0) since they support non-power-of-two-textures */ if (!is_pow2_limit(rectw) || !is_pow2_limit(recth)) { rectw= smaller_pow2_limit(rectw); @@ -749,14 +749,16 @@ int GPU_upload_dxt_texture(ImBuf *ibuf) return 1; #else - return 0; + (void)ibuf; + return 0; #endif } void GPU_create_gl_tex_compressed(unsigned int *bind, unsigned int *pix, int x, int y, int mipmap, Image *ima, ImBuf *ibuf) { #ifndef WITH_DDS - // Fall back to uncompressed if DDS isn't enabled + (void)ibuf; + /* Fall back to uncompressed if DDS isn't enabled */ GPU_create_gl_tex(bind, pix, NULL, x, y, mipmap, 0, ima); #else |