summaryrefslogtreecommitdiff
path: root/src/core/shader.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/shader.h')
-rw-r--r--src/core/shader.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/shader.h b/src/core/shader.h
index f663a47..bc4e04c 100644
--- a/src/core/shader.h
+++ b/src/core/shader.h
@@ -23,7 +23,7 @@ typedef struct UniformCollection {
void* userdata;
} UniformCollection;
-#define TEX(i) (&uniforms->var_tex[i])
+#define TEX(i) (uniforms->var_tex[i])
#define UM4(i) (&uniforms->var_mat4[i])
#define UV2(i) (&uniforms->var_vec2[i])
#define UV3(i) (&uniforms->var_vec3[i])
@@ -157,8 +157,6 @@ Register reg_v2[6];
Register reg_v3[8];
Register reg_v4[6];
-void reg_all_wipe(); /*标记清空所有寄存器*/
-
/*寄存器指针,使用错误可能会出现野指针*/
float* reg_num_00;
@@ -189,16 +187,12 @@ Vec4* reg_v4_03;
Vec4* reg_v4_04;
Vec4* reg_v4_05;
-/*设置寄存器指针,指向寄存器(注意在fragment阶段,指针会指向fragmentIn结构)*/
+/*设置寄存器指针,指向寄存器(在fragment阶段,指针会指向fragmentIn结构)*/
void ssrS_setupregisterpoints(uint extra_varying_flag, int idx);
/*设置寄存器指针,指向fragIn结构*/
void ssrS_setregtofragin(uint extra_varying_flag, FragmentShaderIn* frag_in);
-
-/*
-** texture
-*/
-Color32 texture2d(float x, float y);
+Color32 texture2d(Texture* tex, Vec2* uv);
#endif \ No newline at end of file