[gtk: 2/2] Merge branch 'handle-max-texture-size' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 2/2] Merge branch 'handle-max-texture-size' into 'master'
- Date: Tue, 11 Feb 2020 16:23:56 +0000 (UTC)
commit 720e48ec51f19b5d2b44834cdad5c3a15c4648c2
Merge: 9d0393d8e6 8fdb710c0f
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Feb 11 16:23:02 2020 +0000
Merge branch 'handle-max-texture-size' into 'master'
gl: Don't require too large texture for offsreen ops
See merge request GNOME/gtk!1411
gsk/gl/gskglrenderer.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
---
diff --cc gsk/gl/gskglrenderer.c
index 011bbb18b8,3f12412377..b0b8531f37
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@@ -3051,8 -3048,9 +3049,9 @@@ add_offscreen_ops (GskGLRendere
graphene_matrix_t prev_projection;
graphene_rect_t prev_viewport;
graphene_matrix_t item_proj;
- float prev_opacity;
+ float prev_opacity = 1.0;
int texture_id = 0;
+ int max_texture_size;
if (node_is_invisible (child_node))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]