Correctly check the length of the correction value property

[geometrycompositor.git] / source / main.c

diff --git a/source/main.c b/source/main.c
index 8aa377fbcf40a0c11a768df8bd83d0a3a287ad9b..1a4d5960b257059dccf6d288a0d024be9ed30b36 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -103,7 +103,7 @@ typedef struct Compositor
 } Compositor;
 
 static const char *vshader_src =
-       "#version 150\n"
+       "#version 130\n"
        "uniform vec4 geometry;\n"
        "in vec2 vertex;\n"
        "in vec2 texture_coord;\n"
@@ -115,7 +115,7 @@ static const char *vshader_src =
        "}\n";
 
 static const char *fshader_src =
-       "#version 150\n"
+       "#version 130\n"
        "uniform sampler2D image;\n"
        "in vec2 texcoord;\n"
        "out vec4 frag_color;\n"
@@ -125,7 +125,7 @@ static const char *fshader_src =
        "}\n";
 
 static const char *masked_fshader_src =
-       "#version 150\n"
+       "#version 130\n"
        "uniform sampler2D image;\n"
        "uniform sampler2D mask;\n"
        "in vec2 texcoord;\n"
@@ -653,8 +653,8 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
                {
                        i = 1+(1+y*2+x)*3;
                        monitor->geometry_data[i] = ((x-0.5f)*distance/monitor->perspective)*10000;
-                       monitor->geometry_data[i+1] = (eye[1]+look[1]*distance-(y-0.5f)*look[2]*distance/monitor->perspective/aspect)*10000;
-                       monitor->geometry_data[i+2] = (eye[2]+look[2]*distance+(y-0.5f)*look[1]*distance/monitor->perspective/aspect)*10000;
+                       monitor->geometry_data[i+1] = (eye[1]+look[1]*distance-(y-monitor->vertical_center)*look[2]*distance/monitor->perspective/aspect)*10000;
+                       monitor->geometry_data[i+2] = (eye[2]+look[2]*distance+(y-monitor->vertical_center)*look[1]*distance/monitor->perspective/aspect)*10000;
                }
        for(i=0; i<(t+1)*(t+1)*3; ++i)
                monitor->geometry_data[16+i] = vertex_data[i]*10000;
@@ -821,7 +821,7 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
        use_gl(compositor, screen);
 
        name_ptr = names;
-       for(i=0; i*4<values_length; ++i)
+       for(i=0; i*4+3<values_length; ++i)
        {
                CompositedMonitor *monitor;