X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fsky.h;fp=shaders%2Fsky.h;h=53fb5a6645e7ffc23dfb723f75da19f15af9f5a8;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=0abd65a1b12b5291217b3d5db3188ac4cc073e6d;hpb=d5405f24a854aff8b76bb126492f2c18bc874270;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/sky.h b/shaders/sky.h index 0abd65a..53fb5a6 100644 --- a/shaders/sky.h +++ b/shaders/sky.h @@ -18,8 +18,8 @@ static struct vg_shader _shader_sky = { "\n" "#line 2 0 \n" "\n" -"uniform mat4 uPv;\n" "uniform mat4x3 uMdl;\n" +"uniform mat4 uPv;\n" "\n" "out vec4 aColour;\n" "out vec2 aUv;\n" @@ -78,17 +78,17 @@ static struct vg_shader _shader_sky = { ""}, }; -static GLuint _uniform_sky_uPv; static GLuint _uniform_sky_uMdl; +static GLuint _uniform_sky_uPv; static GLuint _uniform_sky_uColour; static GLuint _uniform_sky_uTexGarbage; static GLuint _uniform_sky_uTime; -static void shader_sky_uPv(m4x4f m){ - glUniformMatrix4fv( _uniform_sky_uPv, 1, GL_FALSE, (float *)m ); -} static void shader_sky_uMdl(m4x3f m){ glUniformMatrix4x3fv( _uniform_sky_uMdl, 1, GL_FALSE, (float *)m ); } +static void shader_sky_uPv(m4x4f m){ + glUniformMatrix4fv( _uniform_sky_uPv, 1, GL_FALSE, (float *)m ); +} static void shader_sky_uColour(v4f v){ glUniform4fv( _uniform_sky_uColour, 1, v ); } @@ -103,8 +103,8 @@ static void shader_sky_register(void){ } static void shader_sky_use(void){ glUseProgram(_shader_sky.id); } static void shader_sky_link(void){ - _uniform_sky_uPv = glGetUniformLocation( _shader_sky.id, "uPv" ); _uniform_sky_uMdl = glGetUniformLocation( _shader_sky.id, "uMdl" ); + _uniform_sky_uPv = glGetUniformLocation( _shader_sky.id, "uPv" ); _uniform_sky_uColour = glGetUniformLocation( _shader_sky.id, "uColour" ); _uniform_sky_uTexGarbage = glGetUniformLocation( _shader_sky.id, "uTexGarbage" ); _uniform_sky_uTime = glGetUniformLocation( _shader_sky.id, "uTime" );