gsk: Cosmetics

diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index da97f301671e442f9654b595fa4d03246379660b..28d75d5556eed8954f1e6eba75cb2954b1e5eaa2 100644 (file)
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -732,7 +732,7 @@ gsk_gl_driver_load_texture (GskGLDriver *self,
   t = gdk_texture_get_render_data (texture, self);
   if (t && t->texture_id)
     {
-      if (ensure_mipmap & !t->has_mipmap)
+      if (ensure_mipmap && !t->has_mipmap)
         {
           glBindTexture (GL_TEXTURE_2D, t->texture_id);
           glGenerateMipmap (GL_TEXTURE_2D);

diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c
index 9974a28a1139904a790e9602346259a71c1f47f4..b2704806754c4cf2ebcc803360d96e5d4ae78e00 100644 (file)
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -3538,9 +3538,12 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
                                  const graphene_rect_t *bounds)
 {
   int max_texture_size = job->command_queue->max_texture_size;
+  float scale_x = bounds->size.width / texture->width;
+  float scale_y = bounds->size.height / texture->height;
   gboolean use_mipmaps;
 
-  use_mipmaps = job->scale_x < 0.5 || job->scale_y < 0.5;
+  use_mipmaps = (scale_x * job->scale_x) < 0.5 ||
+                (scale_y * job->scale_y) < 0.5;
 
   if G_LIKELY (texture->width <= max_texture_size &&
                texture->height <= max_texture_size)
@@ -3567,10 +3570,6 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
     {
       float min_x = job->offset_x + bounds->origin.x;
       float min_y = job->offset_y + bounds->origin.y;
-      float max_x = min_x + bounds->size.width;
-      float max_y = min_y + bounds->size.height;
-      float scale_x = (max_x - min_x) / texture->width;
-      float scale_y = (max_y - min_y) / texture->height;
       GskGLTextureSlice *slices = NULL;
       guint n_slices = 0;
 
@@ -3581,7 +3580,7 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
 
       gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
 
-      for (guint i = 0; i < n_slices; i ++)
+      for (unsigned int i = 0; i < n_slices; i++)
         {
           const GskGLTextureSlice *slice = &slices[i];
           float x1, x2, y1, y2;