diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/rasterizer.c | 8 | ||||
| -rw-r--r-- | src/core/shader.c | 2 | ||||
| -rw-r--r-- | src/core/shader.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/rasterizer.c b/src/core/rasterizer.c index 0c78893..28ae639 100644 --- a/src/core/rasterizer.c +++ b/src/core/rasterizer.c @@ -82,8 +82,6 @@ static void puttriangle(Vec2* A, Vec2* B, Vec2* C, Color c) { ssrR_putline(C->x, C->y, B->x, B->y, c); } -extern FragmentShaderIn ssr_frag_in; - void ssrR_triangle( Vec4* CA, Vec4* CB, Vec4* CC, uint IA, uint IB, uint IC, @@ -176,7 +174,7 @@ void ssrR_triangle( /*interpolate varying variables*/ \ ssrS_solveregsbcp(&bc, IA, IB, IC); \ /*enter fragment shader*/ \ - discard = !frag_shader(uniforms, &ssr_frag_in, out_color[0]); \ + discard = !frag_shader(uniforms, out_color[0]); \ discardif(discard); \ /*put point*/ \ ssr_blendandputpoint(p.x, p.y, blend); \ @@ -308,7 +306,7 @@ void ssrR_line( discardif(!pass_depth_test || !pass_stencil_test); /*solve registers with lerp*/ ssrS_solveregslerp(t, IA, IB); - discard = !frag_shader(uniforms, &ssr_frag_in, out_color[0]); + discard = !frag_shader(uniforms, out_color[0]); discardif(discard); /*put point*/ ssr_blendandputpoint(px, py, blend); @@ -354,7 +352,7 @@ void ssrR_point(Vec4* CA, uint IA, Program* program, UniformCollection* uniforms } discardif(!pass_depth_test || !pass_stencil_test); ssrS_solveregscopy(IA); - discard = !frag_shader(uniforms, &ssr_frag_in, out_color[0]); + discard = !frag_shader(uniforms, out_color[0]); discardif(discard); /*put point*/ ssr_blendandputpoint(px, py, blend); diff --git a/src/core/shader.c b/src/core/shader.c index b523df7..c0ca5d0 100644 --- a/src/core/shader.c +++ b/src/core/shader.c @@ -5,6 +5,8 @@ extern FragmentShaderIn ssr_frag_in; +// LUTs + Register registers[REG_TOTAL] = { /*4 float registers*/ { 0, REGTYPE_NUM, sizeof(float), NULL }, diff --git a/src/core/shader.h b/src/core/shader.h index 70b4ce9..71f26e4 100644 --- a/src/core/shader.h +++ b/src/core/shader.h @@ -51,7 +51,7 @@ typedef struct { Vec4 v4[REG_V4_COUNT]; } FragmentShaderIn; -typedef bool(*FragmentShader)(UniformCollection* uniforms, FragmentShaderIn* in, Color32* color); +typedef bool(*FragmentShader)(UniformCollection* uniforms, Color32* color); typedef struct { VertexShader vertexshader; |