[gtk/testsuite-asserts: 3/13] gsk: Avoid compiler warnings without assertions




commit 9d3aa2cfce5cb113cd4263b63b07a2ceb57bd4bf
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 12 17:08:33 2021 -0400

    gsk: Avoid compiler warnings without assertions
    
    Disabling assertions was provoking some unused variable
    warnings from the compiler. Avoid these.

 gsk/gl/gskgldriver.c   | 4 +---
 gsk/gl/gskglrenderer.c | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index e1d019c029..621c25825c 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -433,8 +433,6 @@ gsk_gl_driver_slice_texture (GskGLDriver   *self,
                              guint         *out_n_slices)
 {
   const int max_texture_size = gsk_gl_driver_get_max_texture_size (self) / 4; // XXX Too much?
-  const int tex_width = texture->width;
-  const int tex_height = texture->height;
   const int cols = (texture->width / max_texture_size) + 1;
   const int rows = (texture->height / max_texture_size) + 1;
   int col, row;
@@ -442,7 +440,7 @@ gsk_gl_driver_slice_texture (GskGLDriver   *self,
   TextureSlice *slices;
   Texture *tex;
 
-  g_assert (tex_width > max_texture_size || tex_height > max_texture_size);
+  g_assert (texture->width > max_texture_size || texture->height > max_texture_size);
 
 
   tex = gdk_texture_get_render_data (texture, self);
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index c72cedaeb4..b7c2ac43c7 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -1997,12 +1997,11 @@ render_unblurred_inset_shadow_node (GskGLRenderer   *self,
                                     GskRenderNode   *node,
                                     RenderOpBuilder *builder)
 {
-  const float blur_radius = gsk_inset_shadow_node_get_blur_radius (node);
   const float dx = gsk_inset_shadow_node_get_dx (node);
   const float dy = gsk_inset_shadow_node_get_dy (node);
   const float spread = gsk_inset_shadow_node_get_spread (node);
 
-  g_assert (blur_radius == 0);
+  g_assert (gsk_inset_shadow_node_get_blur_radius (node) == 0);
 
   ops_set_program (builder, &self->programs->inset_shadow_program);
   ops_set_inset_shadow (builder, transform_rect (self, builder, gsk_inset_shadow_node_get_outline (node)),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]