summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-03-13 23:38:54 -0500
committerMatthias Clasen <mclasen@redhat.com>2021-03-14 16:49:31 -0400
commit29501f53981b0be1f458da28ffaf934507c73772 (patch)
treeb75c7a2a12081416725683de98ab77dba7d3fcdf
parent3408240ba65394edffb51240d82d669024e24160 (diff)
downloadgtk+-29501f53981b0be1f458da28ffaf934507c73772.tar.gz
ngl: Fix up uniform enums
This got messed up when color was changed from a uniform to an attribute in 06d5c8e72dee3d6339.
-rw-r--r--gsk/ngl/gsknglprograms.defs18
1 files changed, 9 insertions, 9 deletions
diff --git a/gsk/ngl/gsknglprograms.defs b/gsk/ngl/gsknglprograms.defs
index e20cca2fa9..8af9140eed 100644
--- a/gsk/ngl/gsknglprograms.defs
+++ b/gsk/ngl/gsknglprograms.defs
@@ -15,8 +15,8 @@ GSK_NGL_DEFINE_PROGRAM (blur,
GSK_NGL_DEFINE_PROGRAM (border,
"/org/gtk/libgsk/ngl/border.glsl",
- GSK_NGL_ADD_UNIFORM (2, BORDER_WIDTHS, u_widths)
- GSK_NGL_ADD_UNIFORM (3, BORDER_OUTLINE_RECT, u_outline_rect))
+ GSK_NGL_ADD_UNIFORM (1, BORDER_WIDTHS, u_widths)
+ GSK_NGL_ADD_UNIFORM (2, BORDER_OUTLINE_RECT, u_outline_rect))
GSK_NGL_DEFINE_PROGRAM (color,
"/org/gtk/libgsk/ngl/color.glsl",
@@ -44,9 +44,9 @@ GSK_NGL_DEFINE_PROGRAM (cross_fade,
GSK_NGL_DEFINE_PROGRAM (inset_shadow,
"/org/gtk/libgsk/ngl/inset_shadow.glsl",
- GSK_NGL_ADD_UNIFORM (2, INSET_SHADOW_SPREAD, u_spread)
- GSK_NGL_ADD_UNIFORM (3, INSET_SHADOW_OFFSET, u_offset)
- GSK_NGL_ADD_UNIFORM (4, INSET_SHADOW_OUTLINE_RECT, u_outline_rect))
+ GSK_NGL_ADD_UNIFORM (1, INSET_SHADOW_SPREAD, u_spread)
+ GSK_NGL_ADD_UNIFORM (2, INSET_SHADOW_OFFSET, u_offset)
+ GSK_NGL_ADD_UNIFORM (3, INSET_SHADOW_OUTLINE_RECT, u_outline_rect))
GSK_NGL_DEFINE_PROGRAM (linear_gradient,
"/org/gtk/libgsk/ngl/linear_gradient.glsl",
@@ -57,7 +57,7 @@ GSK_NGL_DEFINE_PROGRAM (linear_gradient,
GSK_NGL_DEFINE_PROGRAM (outset_shadow,
"/org/gtk/libgsk/ngl/outset_shadow.glsl",
- GSK_NGL_ADD_UNIFORM (2, OUTSET_SHADOW_OUTLINE_RECT, u_outline_rect))
+ GSK_NGL_ADD_UNIFORM (1, OUTSET_SHADOW_OUTLINE_RECT, u_outline_rect))
GSK_NGL_DEFINE_PROGRAM (radial_gradient,
"/org/gtk/libgsk/ngl/radial_gradient.glsl",
@@ -74,6 +74,6 @@ GSK_NGL_DEFINE_PROGRAM (repeat,
GSK_NGL_DEFINE_PROGRAM (unblurred_outset_shadow,
"/org/gtk/libgsk/ngl/unblurred_outset_shadow.glsl",
- GSK_NGL_ADD_UNIFORM (2, UNBLURRED_OUTSET_SHADOW_SPREAD, u_spread)
- GSK_NGL_ADD_UNIFORM (3, UNBLURRED_OUTSET_SHADOW_OFFSET, u_offset)
- GSK_NGL_ADD_UNIFORM (4, UNBLURRED_OUTSET_SHADOW_OUTLINE_RECT, u_outline_rect))
+ GSK_NGL_ADD_UNIFORM (1, UNBLURRED_OUTSET_SHADOW_SPREAD, u_spread)
+ GSK_NGL_ADD_UNIFORM (2, UNBLURRED_OUTSET_SHADOW_OFFSET, u_offset)
+ GSK_NGL_ADD_UNIFORM (3, UNBLURRED_OUTSET_SHADOW_OUTLINE_RECT, u_outline_rect))