|
20 | 20 | #include <semaphore.h>
|
21 | 21 |
|
22 | 22 | #include <flutter_embedder.h>
|
| 23 | +#include <mesa3d/dynarray.h> |
23 | 24 | #include <systemd/sd-event.h>
|
24 | 25 |
|
25 | 26 | #include "cursor.h"
|
|
33 | 34 | #include "surface.h"
|
34 | 35 | #include "tracer.h"
|
35 | 36 | #include "util/collection.h"
|
36 |
| -#include "util/dynarray.h" |
37 | 37 | #include "util/logging.h"
|
38 | 38 | #include "util/refcounting.h"
|
39 | 39 | #include "window.h"
|
@@ -231,7 +231,7 @@ static void fill_platform_view_layer_props(
|
231 | 231 | size_t n_mutations,
|
232 | 232 | const struct mat3f *display_to_view_transform,
|
233 | 233 | const struct mat3f *view_to_display_transform,
|
234 |
| - double device_pixel_ratio |
| 234 | + float device_pixel_ratio |
235 | 235 | ) {
|
236 | 236 | (void) view_to_display_transform;
|
237 | 237 |
|
@@ -262,8 +262,8 @@ static void fill_platform_view_layer_props(
|
262 | 262 | * ```
|
263 | 263 | */
|
264 | 264 |
|
265 |
| - rect.size.x /= device_pixel_ratio; |
266 |
| - rect.size.y /= device_pixel_ratio; |
| 265 | + rect.size.x /= (double) device_pixel_ratio; |
| 266 | + rect.size.y /= (double) device_pixel_ratio; |
267 | 267 |
|
268 | 268 | // okay, now we have the params.finalBoundingRect().x() in aa_back_transformed.x and
|
269 | 269 | // params.finalBoundingRect().y() in aa_back_transformed.y.
|
@@ -348,8 +348,9 @@ static int compositor_push_fl_layers(struct compositor *compositor, size_t n_fl_
|
348 | 348 | /// TODO: Implement
|
349 | 349 | layer->surface = compositor_get_view_by_id_locked(compositor, fl_layer->platform_view->identifier);
|
350 | 350 | if (layer->surface == NULL) {
|
351 |
| - layer->surface = |
352 |
| - CAST_SURFACE(dummy_render_surface_new(compositor->tracer, VEC2I(fl_layer->size.width, fl_layer->size.height))); |
| 351 | + layer->surface = CAST_SURFACE( |
| 352 | + dummy_render_surface_new(compositor->tracer, VEC2I((int) fl_layer->size.width, (int) fl_layer->size.height)) |
| 353 | + ); |
353 | 354 | }
|
354 | 355 | #else
|
355 | 356 | // in release mode, we just assume the id is valid.
|
@@ -384,10 +385,6 @@ static int compositor_push_fl_layers(struct compositor *compositor, size_t n_fl_
|
384 | 385 |
|
385 | 386 | fl_layer_composition_unref(composition);
|
386 | 387 |
|
387 |
| - return 0; |
388 |
| - |
389 |
| - //fail_free_composition: |
390 |
| - //fl_layer_composition_unref(composition); |
391 | 388 | return ok;
|
392 | 389 | }
|
393 | 390 |
|
@@ -556,14 +553,14 @@ void compositor_set_cursor(
|
556 | 553 |
|
557 | 554 | struct view_geometry viewgeo = window_get_view_geometry(compositor->main_window);
|
558 | 555 |
|
559 |
| - if (compositor->cursor_pos.x < 0.0f) { |
560 |
| - compositor->cursor_pos.x = 0.0f; |
| 556 | + if (compositor->cursor_pos.x < 0.0) { |
| 557 | + compositor->cursor_pos.x = 0.0; |
561 | 558 | } else if (compositor->cursor_pos.x > viewgeo.view_size.x) {
|
562 | 559 | compositor->cursor_pos.x = viewgeo.view_size.x;
|
563 | 560 | }
|
564 | 561 |
|
565 |
| - if (compositor->cursor_pos.y < 0.0f) { |
566 |
| - compositor->cursor_pos.y = 0.0f; |
| 562 | + if (compositor->cursor_pos.y < 0.0) { |
| 563 | + compositor->cursor_pos.y = 0.0; |
567 | 564 | } else if (compositor->cursor_pos.y > viewgeo.view_size.y) {
|
568 | 565 | compositor->cursor_pos.y = viewgeo.view_size.y;
|
569 | 566 | }
|
|
0 commit comments