From cd5f7f9c3ff949dcc5922fd91e79028a9bf489ab Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sat, 2 Oct 2010 02:04:46 +0200 Subject: Revert "Shaders won't work on my laptop without Nx4 matrices." This reverts commit 727cb49631d92a284fd7fe850022b9bd0e5f3bad. --- shaders/bullet_fragment.glsl | 4 +--- shaders/bullet_vertex.glsl | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/shaders/bullet_fragment.glsl b/shaders/bullet_fragment.glsl index 71486ec..55e29ff 100644 --- a/shaders/bullet_fragment.glsl +++ b/shaders/bullet_fragment.glsl @@ -1,6 +1,4 @@ -#version 120 - -in mat3x4 v_tex_rot; +varying mat3 v_tex_rot; uniform sampler2D tex; void main() { diff --git a/shaders/bullet_vertex.glsl b/shaders/bullet_vertex.glsl index 96281cd..0717b0a 100644 --- a/shaders/bullet_vertex.glsl +++ b/shaders/bullet_vertex.glsl @@ -1,14 +1,12 @@ -#version 120 - -varying out mat3x4 v_tex_rot; +varying mat3 v_tex_rot; void main() { vec4 l_position = gl_Vertex; vec2 l_direction = normalize(l_position.zw); - v_tex_rot = mat3x4( - l_direction.x, l_direction.y, 0.0, 0.0, - -l_direction.y, l_direction.x, 0.0, 0.0, - 1.0 - l_direction.x + l_direction.y, 1.0 - l_direction.y - l_direction.x, 0.0, 0.0); + v_tex_rot = mat3( + l_direction.x, l_direction.y, 0.0, + -l_direction.y, l_direction.x, 0.0, + 1.0 - l_direction.x + l_direction.y, 1.0 - l_direction.y - l_direction.x, 0.0); l_position.zw = vec2(0.0, 1.0); gl_FrontColor = gl_Color; gl_Position = gl_ModelViewProjectionMatrix * l_position; -- cgit v1.2.3