X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Falphatest.h;h=9b161c1b86a28950c59c3fd1781977bf033cac06;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=80ce028df5bd3622141e9837362a195e5c9a3e03;hpb=d5405f24a854aff8b76bb126492f2c18bc874270;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/alphatest.h b/shaders/alphatest.h index 80ce028..9b161c1 100644 --- a/shaders/alphatest.h +++ b/shaders/alphatest.h @@ -18,8 +18,8 @@ static struct vg_shader _shader_alphatest = { "\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" @@ -186,19 +186,19 @@ static struct vg_shader _shader_alphatest = { ""}, }; -static GLuint _uniform_alphatest_uPv; static GLuint _uniform_alphatest_uMdl; +static GLuint _uniform_alphatest_uPv; static GLuint _uniform_alphatest_uTexGarbage; static GLuint _uniform_alphatest_uTexMain; static GLuint _uniform_alphatest_uCamera; static GLuint _uniform_alphatest_uPlane; static GLuint _uniform_alphatest_g_world_depth; -static void shader_alphatest_uPv(m4x4f m){ - glUniformMatrix4fv( _uniform_alphatest_uPv, 1, GL_FALSE, (float *)m ); -} static void shader_alphatest_uMdl(m4x3f m){ glUniformMatrix4x3fv( _uniform_alphatest_uMdl, 1, GL_FALSE, (float *)m ); } +static void shader_alphatest_uPv(m4x4f m){ + glUniformMatrix4fv( _uniform_alphatest_uPv, 1, GL_FALSE, (float *)m ); +} static void shader_alphatest_uTexGarbage(int i){ glUniform1i( _uniform_alphatest_uTexGarbage, i ); } @@ -219,8 +219,8 @@ static void shader_alphatest_register(void){ } static void shader_alphatest_use(void){ glUseProgram(_shader_alphatest.id); } static void shader_alphatest_link(void){ - _uniform_alphatest_uPv = glGetUniformLocation( _shader_alphatest.id, "uPv" ); _uniform_alphatest_uMdl = glGetUniformLocation( _shader_alphatest.id, "uMdl" ); + _uniform_alphatest_uPv = glGetUniformLocation( _shader_alphatest.id, "uPv" ); _uniform_alphatest_uTexGarbage = glGetUniformLocation( _shader_alphatest.id, "uTexGarbage" ); _uniform_alphatest_uTexMain = glGetUniformLocation( _shader_alphatest.id, "uTexMain" ); _uniform_alphatest_uCamera = glGetUniformLocation( _shader_alphatest.id, "uCamera" );