archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPU Texture: Use switch instead of if/else

Browse Source
This commit is contained in:
Dalai Felinto
2017-08-22 12:30:03 +02:00
parent cc5e90f75d
commit 9457715d9a
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -722,17 +722,20 @@ void GPU_texture_update(GPUTexture *tex, const float *pixels)
glBindTexture(tex->target, tex->bindcode);
if (tex->target == GL_TEXTURE_2D ||
tex->target == GL_TEXTURE_2D_MULTISAMPLE ||
tex->target == GL_TEXTURE_1D_ARRAY)
{
glTexSubImage2D(tex->target, 0, 0, 0, tex->w, tex->h, format, data_format, pixels);
}
else if (tex->target == GL_TEXTURE_1D) {
glTexSubImage1D(tex->target, 0, 0, tex->w, format, data_format, pixels);
}
else { /* GL_TEXTURE_3D */
glTexSubImage3D(tex->target, 0, 0, 0, 0, tex->w, tex->h, tex->d, format, data_format, pixels);
switch (tex->target) {
case GL_TEXTURE_2D:
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_1D_ARRAY:
glTexSubImage2D(tex->target, 0, 0, 0, tex->w, tex->h, format, data_format, pixels);
break;
case GL_TEXTURE_1D:
glTexSubImage1D(tex->target, 0, 0, tex->w, format, data_format, pixels);
break;
case GL_TEXTURE_3D:
glTexSubImage3D(tex->target, 0, 0, 0, 0, tex->w, tex->h, tex->d, format, data_format, pixels);
break;
default:
BLI_assert(!"tex->target mode not supported");
}
glBindTexture(tex->target, 0);