summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrediano Ziglio <fziglio@redhat.com>2019-07-22 12:25:29 +0100
committerFrediano Ziglio <fziglio@redhat.com>2019-07-23 11:21:02 +0100
commitf880b6d48888a8cc26c300148cbedc3d8804d29d (patch)
tree3610e85aec6a43e4a378c9f0aefba725544fe1b6
parent902cf95efda15572497efcef199c9faaf200affb (diff)
spice-widget-egl: Declare and initialise "tex" and "verts" shortly
Just syntax change. Reduce code to initialise these matrices. Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Acked-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--src/spice-widget-egl.c40
1 files changed, 13 insertions, 27 deletions
diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index 7db6608..f5e24a0 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -489,33 +489,19 @@ client_draw_rect_tex(SpiceDisplay *display,
float x, float y, float w, float h,
float tx, float ty, float tw, float th)
{
- float verts[4][4];
- float tex[4][2];
-
- verts[0][0] = x;
- verts[0][1] = y;
- verts[0][2] = 0.0;
- verts[0][3] = 1.0;
- tex[0][0] = tx;
- tex[0][1] = ty;
- verts[1][0] = x + w;
- verts[1][1] = y;
- verts[1][2] = 0.0;
- verts[1][3] = 1.0;
- tex[1][0] = tx + tw;
- tex[1][1] = ty;
- verts[2][0] = x;
- verts[2][1] = y + h;
- verts[2][2] = 0.0;
- verts[2][3] = 1.0;
- tex[2][0] = tx;
- tex[2][1] = ty + th;
- verts[3][0] = x + w;
- verts[3][1] = y + h;
- verts[3][2] = 0.0;
- verts[3][3] = 1.0;
- tex[3][0] = tx + tw;
- tex[3][1] = ty + th;
+ GLfloat tex[4][2] = {
+ { tx, ty },
+ { tx + tw, ty },
+ { tx, ty + th },
+ { tx + tw, ty + th },
+ };
+
+ GLfloat verts[4][4] = {
+ { x, y, 0.0, 1.0 },
+ { x + w, y, 0.0, 1.0 },
+ { x, y + h, 0.0, 1.0 },
+ { x + w, y + h, 0.0, 1.0 },
+ };
draw_rect_from_arrays(display, verts, tex);
}