summaryrefslogtreecommitdiff
path: root/src/shaders/common/core.h
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2020-07-18 03:43:19 +0800
committerchai <chaifix@163.com>2020-07-18 03:43:19 +0800
commit4deff343b5fd928ae9475eedcf9b6add34b31ae2 (patch)
treed9108f5fedc9f0dd57bf964763edc508983c80c5 /src/shaders/common/core.h
parent4984946caf0397a13da7605bc1ee406ea7354628 (diff)
-uniform collection
Diffstat (limited to 'src/shaders/common/core.h')
-rw-r--r--src/shaders/common/core.h10
1 files changed, 5 insertions, 5 deletions
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);