[Scummvm-git-logs] scummvm master -> 760699ab0f3a5605687e045b6e11ff879ec9386a

aquadran aquadran at gmail.com
Sun Nov 7 14:44:49 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
760699ab0f TINYGL: Added check if texture is selected to avoid textured triangle path


Commit: 760699ab0f3a5605687e045b6e11ff879ec9386a
    https://github.com/scummvm/scummvm/commit/760699ab0f3a5605687e045b6e11ff879ec9386a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-11-07T15:44:45+01:00

Commit Message:
TINYGL: Added check if texture is selected to avoid textured triangle path

Changed paths:
    graphics/tinygl/clip.cpp


diff --git a/graphics/tinygl/clip.cpp b/graphics/tinygl/clip.cpp
index b6b6f3469e..c3d7440cec 100644
--- a/graphics/tinygl/clip.cpp
+++ b/graphics/tinygl/clip.cpp
@@ -407,7 +407,7 @@ void gl_draw_triangle_fill(GLContext *c, GLVertex *p0, GLVertex *p1, GLVertex *p
 	} else if (c->shadow_mode & 2) {
 		assert(c->fb->shadow_mask_buf);
 		c->fb->fillTriangleFlatShadow(&p0->zp, &p1->zp, &p2->zp);
-	} else if (c->texture_2d_enabled) {
+	} else if (c->texture_2d_enabled && c->current_texture) {
 #ifdef TINYGL_PROFILE
 		count_triangles_textured++;
 #endif




More information about the Scummvm-git-logs mailing list