[Bf-blender-cvs] [9457715d9a6] blender2.8: GPU Texture: Use switch instead of if/else

Dalai Felinto noreply at git.blender.org
Tue Aug 22 12:37:13 CEST 2017


Commit: 9457715d9a6feb574d9f33246842079a9cb15288
Author: Dalai Felinto
Date:   Tue Aug 22 12:30:03 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB9457715d9a6feb574d9f33246842079a9cb15288

GPU Texture: Use switch instead of if/else

===================================================================

M	source/blender/gpu/intern/gpu_texture.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index e8d488afbdd..25e54633552 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -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);



More information about the Bf-blender-cvs mailing list