sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Silence warnings

Browse Source 
```
...\gpu_texture.c(466,7): warning C4555: result of expression not used
...\gpu_texture.c(559,7): warning C4555: result of expression not used
...\gpu_texture.c:1205:72: warning: pointer targets in passing argument 4 of ‘glGetTexLevelParameteriv’ differ in signedness [-Wpointer-sign]
```
This commit is contained in:
Germano Cavalcante 2020-03-24 12:33:13 -03:00
parent d5c177bc90
commit 266d243d8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/gpu/intern/gpu_texture.c
View File

@ -463,7 +463,7 @@ static GLenum gpu_format_to_gl_internalformat(eGPUTextureFormat format)
case GPU_R8UI: case GPU_R8UI:
return GL_R8UI; return GL_R8UI;
case GPU_R8I: case GPU_R8I:
GL_R8I; return GL_R8I;
case GPU_R8: case GPU_R8:
return GL_R8; return GL_R8;
case GPU_R32UI: case GPU_R32UI:
@ -507,7 +507,7 @@ static GLenum gpu_format_to_gl_internalformat(eGPUTextureFormat format)
} }
} }
static eGPUTextureFormat gl_internalformat_to_gpu_format(const GLenum glformat) static eGPUTextureFormat gl_internalformat_to_gpu_format(const GLint glformat)
{ {
/* You can add any of the available type to this list /* You can add any of the available type to this list
* For available types see GPU_texture.h */ * For available types see GPU_texture.h */
@ -556,7 +556,7 @@ static eGPUTextureFormat gl_internalformat_to_gpu_format(const GLenum glformat)
case GL_R8UI: case GL_R8UI:
return GPU_R8UI; return GPU_R8UI;
case GL_R8I: case GL_R8I:
GPU_R8I; return GPU_R8I;
case GL_R8: case GL_R8:
return GPU_R8; return GPU_R8;
case GL_R32UI: case GL_R32UI:
@ -596,8 +596,8 @@ static eGPUTextureFormat gl_internalformat_to_gpu_format(const GLenum glformat)
return GPU_DEPTH_COMPONENT16; return GPU_DEPTH_COMPONENT16;
default: default:
BLI_assert(!"Internal format incorrect or unsupported\n"); BLI_assert(!"Internal format incorrect or unsupported\n");
return -1;
} }
return -1;
} }
static GLenum gpu_get_gl_datatype(eGPUDataFormat format) static GLenum gpu_get_gl_datatype(eGPUDataFormat format)
@ -1195,8 +1195,8 @@ GPUTexture *GPU_texture_from_bindcode(int textarget, int bindcode)
GPU_print_error_debug("Blender Texture Not Loaded"); GPU_print_error_debug("Blender Texture Not Loaded");
} }
else { else {
GLint w, h; GLint w, h, gl_format;
GLenum gettarget, gl_format; GLenum gettarget;
gettarget = (textarget == GL_TEXTURE_CUBE_MAP) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : textarget; gettarget = (textarget == GL_TEXTURE_CUBE_MAP) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : textarget;
glBindTexture(textarget, tex->bindcode); glBindTexture(textarget, tex->bindcode);