Browse Source

Travis fix again

Thomas Buck 9 years ago
parent
commit
70da40d6ae
2 changed files with 5 additions and 2 deletions
  1. 4
    1
      cmake/travis_script_linux.sh
  2. 1
    1
      src/system/Shader.cpp

+ 4
- 1
cmake/travis_script_linux.sh View File

@@ -8,10 +8,13 @@ if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
8 8
 
9 9
 git clone https://github.com/hpicgs/glbinding.git
10 10
 cd glbinding
11
-cmake .
11
+mkdir build
12
+cd build
13
+cmake ..
12 14
 make -j4
13 15
 sudo make install
14 16
 cd ..
17
+cd ..
15 18
 
16 19
 mkdir build && cd build && cmake .. && make -j 4 && make check
17 20
 

+ 1
- 1
src/system/Shader.cpp View File

@@ -288,7 +288,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color,
288 288
     }
289 289
 
290 290
     shader.use();
291
-    shader.loadUniform(0, Window::getSize());
291
+    shader.loadUniform(0, glm::vec2(Window::getSize()));
292 292
     shader.loadUniform(1, texture, store);
293 293
     shader.loadUniform(2, color);
294 294
     vertices.bindBuffer(0, 2);

Loading…
Cancel
Save