From d5375d5308b3483f5dc8da89943d5a98f67818d5 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 3 Feb 2016 14:19:09 +0100 Subject: Get rid of extra_load(), rename parameters --- common.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'common.c') diff --git a/common.c b/common.c index 25fc56a..e9258c1 100644 --- a/common.c +++ b/common.c @@ -36,9 +36,18 @@ char *filename; float current_time = 0; +GLint param0 = 0; +GLint param1 = 0; +GLint param2 = 0; + + static GLint time_loc; static GLint res_loc; +static GLint param0_loc; +static GLint param1_loc; +static GLint param2_loc; + static char * readfile(const char *name) { FILE *f = fopen(name, "r"); @@ -114,7 +123,9 @@ void load(void) { time_loc = glGetUniformLocation(program, "time"); res_loc = glGetUniformLocation(program, "res"); - extra_load(program); + param0_loc = glGetUniformLocation(program, "param0"); + param1_loc = glGetUniformLocation(program, "param1"); + param2_loc = glGetUniformLocation(program, "param2"); glUseProgram(program); @@ -135,6 +146,10 @@ void render(int width, int height) { glUniform1f(time_loc, current_time); glUniform2f(res_loc, width, height); + glUniform1i(param0_loc, param0); + glUniform1i(param1_loc, param1); + glUniform1i(param2_loc, param2); + glBegin(GL_QUADS); glVertex2f(-1, -1); glVertex2f(1, -1); -- cgit v1.2.3