From 4deff343b5fd928ae9475eedcf9b6add34b31ae2 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 18 Jul 2020 03:43:19 +0800 Subject: -uniform collection --- src/shaders/common/core.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/shaders/common/core.h') diff --git a/src/shaders/common/core.h b/src/shaders/common/core.h index 2e895c5..ef58897 100644 --- a/src/shaders/common/core.h +++ b/src/shaders/common/core.h @@ -7,10 +7,10 @@ /* variables */ /************************************************************************/ -#define _model_matrix (uniforms->model) -#define _view_matrix (uniforms->view) -#define _proj_matrix (uniforms->projection) -#define _mvp_matrix (uniforms->mvp) +#define _model_matrix (g_uniforms->model) +#define _view_matrix (g_uniforms->view) +#define _proj_matrix (g_uniforms->projection) +#define _mvp_matrix (g_uniforms->mvp) #define _it_model_matrix /*inverse-transpose model matrix if needed*/ // near @@ -51,7 +51,7 @@ if(cond) return 0; \ #define MVP_PROCESS \ do{ \ static Vec4 p; p.xyz = in->position; p.w = 1; \ -internal_mat4_mulvec4(uniforms->mvp, &p, clipcoord); \ +internal_mat4_mulvec4(g_uniforms->mvp, &p, clipcoord); \ }while(0) #define object2clip(pos, out) internal_mat4_mulvec4(_mvp_matrix, pos, out); -- cgit v1.1-26-g67d0