comparison: src/shader.c
src/shader.c
- changeset 221
- 14eddd43b3f7
- parent 169
- 6e6717d9c776
equal
deleted
inserted
replaced
| 220:6b266e907f89 | 221:14eddd43b3f7 |
|---|---|
| 183 if (asc_shader_invalid(shader)) return -1; | 183 if (asc_shader_invalid(shader)) return -1; |
| 184 asc_active_glctx->active_program = shader->gl_id; | 184 asc_active_glctx->active_program = shader->gl_id; |
| 185 glUseProgram(shader->gl_id); | 185 glUseProgram(shader->gl_id); |
| 186 glUniformMatrix4fv(shader->projection, 1, GL_FALSE, camera->projection); | 186 glUniformMatrix4fv(shader->projection, 1, GL_FALSE, camera->projection); |
| 187 glUniformMatrix4fv(shader->view, 1, GL_FALSE, camera->view); | 187 glUniformMatrix4fv(shader->view, 1, GL_FALSE, camera->view); |
| 188 return asc_error_catch_all_gl(); | 188 return asc_error_catch_gl("Activating shader"); |
| 189 } | 189 } |
| 190 | 190 |
| 191 static int asc_shader_load_code_file(const char *filename, char **code) { | 191 static int asc_shader_load_code_file(const char *filename, char **code) { |
| 192 if (filename == NULL) { | 192 if (filename == NULL) { |
| 193 *code = NULL; | 193 *code = NULL; |
