Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 5187 → Rev 5186

/programs/develop/libraries/TinyGL/asm_fork/clip.asm
43,9 → 43,6
fadd dword[eax+offs_cont_viewport+offs_vpor_trans+offs_Z]
fistp dword[ebx+offs_vert_zp+offs_zbup_z] ;v.zp.z = st0, st0 = st1
 
ffree st0
fincstp
 
; color
bt dword[eax+offs_cont_lighting_enabled],0
jnc @f
698,13 → 695,13
mov edi,dword[ebx+offs_vert_zp+offs_zbup_y]
mov dword[norm],edi
fimul dword[norm]
fsubp
fsub st0,st1
 
;st0 = (p1.zp.x-p0.zp.x)*(p2.zp.y-p0.zp.y) - (p2.zp.x-p0.zp.x)*(p1.zp.y-p0.zp.y)
 
mov dword[front],0
fldz
fcompp
fcom st1
fstsw ax
sahf
je .end_f
744,9 → 741,11
and eax,[cc]
and eax,[cc+4]
cmp eax,0
jne .end_f
jne @f
stdcall gl_draw_triangle_clip, [context],ebx,ecx,edx,0
.end_f:
finit
@@:
popad
ret
endp
987,7 → 986,7
add ebx,offs_vert_zp
stdcall ZB_plot,dword[edx+offs_cont_zb],ebx
@@:
mov eax,[p1]
add eax,[p1]
cmp dword[eax+offs_vert_edge_flag],0
je @f
mov ebx,eax
994,7 → 993,7
add ebx,offs_vert_zp
stdcall ZB_plot,dword[edx+offs_cont_zb],ebx
@@:
mov eax,[p2]
add eax,[p2]
cmp dword[eax+offs_vert_edge_flag],0
je @f
mov ebx,eax
/programs/develop/libraries/TinyGL/asm_fork/tinygl.asm
83,10 → 83,6
m_3 db '(3)',13,10,0
m_4 db '(4)',13,10,0
m_5 db '(5)',13,10,0
m_6 db '(6)',13,10,0
m_7 db '(7)',13,10,0
m_8 db '(8)',13,10,0
m_9 db '(9)',13,10,0
 
buf_param rb 80
 
165,11 → 161,6
f_is_l db 'glIsList',0
f_gen_l db 'glGenLists',0
f_end_l db 'glEndList',0
;f_fill_trf db 'ZB_fillTriangleFlat',0
;f_fill_trrgb db 'ZB_fillTriangleSmooth',0
f_fill_tr db 'ZB_fillTriangle...',0
f_fill_tr_nl db ' lines',0
f_fill_tr_nll db ' len',0
 
align 4
proc dbg_print, fun:dword, mes:dword
/programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm
14,7 → 14,7
mov eax,[ecx+offs_zbup_b]
shr eax,8
mov [colorB],al ;colorB=p2.b>>8
;else
else
; color=RGB_TO_PIXEL(p2->r,p2->g,p2->b);
end if
}
29,7 → 29,6
cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
jl .end_0
;edi = pp
mov word[ebx+2*_a],ax ;пишем в буфер глубины новое значение
if TGL_FEATURE_RENDER_BITS eq 24
mov cl,[colorR]
mov ch,[colorG]
36,9 → 35,10
mov word[edi+3*_a],cx
mov cl,[colorB]
mov byte[edi+3*_a +2],cl
;else
else
; pp[_a]=color;
end if
mov word[ebx+2*_a],ax ;пишем в буфер глубины новое значение
.end_0:
mov eax,[dzdx]
add [z],eax
75,67 → 75,55
 
macro PUT_PIXEL _a
{
local .end_0
mov eax,[z]
shr eax,ZB_POINT_Z_FRAC_BITS
mov [zz],eax
mov ebx,[pz]
cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
jl .end_0
;edi = pp
mov word[ebx+2*_a],ax ;пишем в буфер глубины новое значение
if TGL_FEATURE_RENDER_BITS eq 24
mov eax,[or1]
mov cl,ah
mov eax,[og1]
mov ch,ah
mov word[edi+3*_a],cx
mov eax,[ob1]
mov byte[edi+3*_a +2],ah
end if
if TGL_FEATURE_RENDER_BITS eq 16
; if (zz >= pz[_a]) {
; pp[3 * _a]=or1 >> 8;
; pp[3 * _a + 1]=og1 >> 8;
; pp[3 * _a + 2]=ob1 >> 8;
; pz[_a]=zz;
; }
mov eax,[dzdx]
add [z],eax
; og1+=dgdx;
; or1+=drdx;
; ob1+=dbdx;
elseif TGL_FEATURE_RENDER_BITS eq 16
; if (zz >= pz[_a]) {
; tmp=rgb & 0xF81F07E0;
; pp[_a]=tmp | (tmp >> 16);
;else
; pz[_a]=zz;
; }
; z+=dzdx;
; rgb=(rgb+drgbdx) & ( ~ 0x00200800);
else
; if (zz >= pz[_a]) {
; pp[_a] = RGB_TO_PIXEL(or1, og1, ob1);
end if
.end_0:
; pz[_a]=zz;
; }
mov eax,[dzdx]
add [z],eax
if TGL_FEATURE_RENDER_BITS eq 16
; rgb=(rgb+drgbdx) & ( ~ 0x00200800);
; og1+=dgdx;
; or1+=drdx;
; ob1+=dbdx;
end if
if TGL_FEATURE_RENDER_BITS <> 16
mov eax,[dgdx]
add [og1],eax
mov eax,[drdx]
add [or1],eax
mov eax,[dbdx]
add [ob1],eax
end if
}
 
;;;DRAW_LINE_M equ 1
DRAW_LINE_M equ 1
 
macro DRAW_LINE code
{
local .cycle_0
local .cycle_1
if TGL_FEATURE_RENDER_BITS eq 16
if code eq 0
pz dd ? ;uint*
tmp dd ? ;uint
z dd ? ;uint
zz dd ? ;uint
rgb dd ? ;uint
drgbdx dd ? ;uint
n dd ? ;int
; register unsigned short *pz;
; register PIXEL *pp;
; register unsigned int tmp,z,zz,rgb,drgbdx;
; register int n;
end if
if code eq 1
mov eax,[x2]
shr eax,16
sub eax,[x1]
mov [n],eax ;n = (x2 >> 16) - x1
; n=(x2 >> 16) - x1;
; pp=pp1+x1;
; pz=pz1+x1;
; z=z1;
143,27 → 131,21
; rgb|=(g1 >> 5) & 0x000007FF;
; rgb|=(b1 << 5) & 0x001FF000;
; drgbdx=_drgbdx;
align 4
.cycle_0: ;while (n>=3)
cmp dword[n],3
jl .cycle_1
PUT_PIXEL 0
PUT_PIXEL 1
PUT_PIXEL 2
PUT_PIXEL 3
add dword[pz],8
add edi,4
sub [n],4
jmp .cycle_0
.cycle_1: ;while (n>=0)
cmp dword[n],0
jl .cycle_1_end
PUT_PIXEL 0
add dword[pz],2
inc edi
dec dword[n]
jmp .cycle_1
.cycle_1_end:
; while (n>=3) {
; PUT_PIXEL(0);
; PUT_PIXEL(1);
; PUT_PIXEL(2);
; PUT_PIXEL(3);
; pz+=4;
; pp+=4;
; n-=4;
; }
; while (n>=0) {
; PUT_PIXEL(0);
; pz+=1;
; pp+=1;
; n-=1;
; }
end if
end if
}
189,31 → 171,27
 
macro DRAW_INIT
{
mov eax,[zb]
mov eax,[eax+offs_zbuf_current_texture]
mov [texture],eax
; texture=zb->current_texture;
}
 
macro PUT_PIXEL _a
{
local .end_0
mov eax,[z]
shr eax,ZB_POINT_Z_FRAC_BITS
mov [zz],eax
mov ebx,[pz]
cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
jl .end_0
; pz[_a]=zz;
; zz=z >> ZB_POINT_Z_FRAC_BITS;
if TGL_FEATURE_RENDER_BITS eq 24
; unsigned char *ptr;
; if (zz >= pz[_a]) {
; ptr = texture + (((t & 0x3FC00000) | s) >> 14) * 3;
; pp[3 * _a]= ptr[0];
; pp[3 * _a + 1]= ptr[1];
; pp[3 * _a + 2]= ptr[2];
; pz[_a]=zz;
; }
else
; if (zz >= pz[_a]) {
; pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
; pz[_a]=zz;
; }
end if
.end_0:
mov eax,[dzdx]
add [z],eax
mov eax,[dsdx]
242,11 → 220,8
 
macro DRAW_INIT
{
mov eax,[zb]
mov eax,[eax+offs_zbuf_current_texture]
mov [texture],eax
fild dword[dzdx]
fstp dword[fdzdx]
; texture=zb->current_texture;
; fdzdx=(float)dzdx;
; fndzdx=NB_INTERP * fdzdx;
; ndszdx=NB_INTERP * dszdx;
; ndtzdx=NB_INTERP * dtzdx;
254,25 → 229,23
 
macro PUT_PIXEL _a
{
local .end_0
mov eax,[z]
shr eax,ZB_POINT_Z_FRAC_BITS
mov [zz],eax
mov ebx,[pz]
cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
jl .end_0
; pz[_a]=zz;
; zz=z >> ZB_POINT_Z_FRAC_BITS;
if TGL_FEATURE_RENDER_BITS eq 24
; unsigned char *ptr;
; if (zz >= pz[_a]) {
; ptr = texture + (((t & 0x3FC00000) | (s & 0x003FC000)) >> 14) * 3;
; pp[3 * _a]= ptr[0];
; pp[3 * _a + 1]= ptr[1];
; pp[3 * _a + 2]= ptr[2];
; pz[_a]=zz;
; }
else
; if (zz >= pz[_a]) {
; pp[_a]=*(PIXEL *)((char *)texture+
; (((t & 0x3FC00000) | (s & 0x003FC000)) >> (17 - PSZSH)));
; pz[_a]=zz;
; }
end if
.end_0:
mov eax,[dzdx]
add [z],eax
mov eax,[dsdx]
288,11 → 261,12
if TGL_FEATURE_RENDER_BITS eq 24
if code eq 0
pz dd ? ;uint *
;edi = pp dd ?
s dd ? ;uint
t dd ? ;uint
z dd ? ;uint
zz dd ? ;uint
n1 dd ? ;int - длинна горизонтальной линии в пикселях
n dd ? ;int
dsdx dd ? ;int
dtdx dd ? ;int
s_z dd ? ;float
301,7 → 275,7
zinv dd ? ;float
end if
if code eq 1
; n1=(x2>>16)-x1;
; n=(x2>>16)-x1;
; fz=(float)z1;
; zinv=1.0 / fz;
; pp=(pp1 + x1 * PSZB);
309,7 → 283,7
; z=z1;
; sz=sz1;
; tz=tz1;
; while (n1>=(NB_INTERP-1)) {
; while (n>=(NB_INTERP-1)) {
; {
; float ss,tt;
; ss=(sz * zinv);
331,7 → 305,7
; PUT_PIXEL(7);
; pz+=NB_INTERP;
; pp=(pp + NB_INTERP * PSZB);
; n1-=NB_INTERP;
; n-=NB_INTERP;
; sz+=ndszdx;
; tz+=ndtzdx;
; }
344,11 → 318,11
; dsdx= (int)( (dszdx - ss*fdzdx)*zinv );
; dtdx= (int)( (dtzdx - tt*fdzdx)*zinv );
; }
; while (n1>=0) {
;;; PUT_PIXEL 0
; while (n>=0) {
; PUT_PIXEL(0);
; pz+=1;
; pp=(PIXEL *)((char *)pp + PSZB);
dec dword[n1]
; n-=1;
; }
end if
end if
359,9 → 333,9
locals
texture dd ? ;PIXEL *
fdzdx dd ? ;float
fndzdx dd ? ;float
ndszdx dd ? ;float
ndtzdx dd ? ;float
fndzdx dd ?
ndszdx dd ?
ndtzdx dd ?
include 'ztriangle.inc'
 
end if
376,37 → 350,27
 
macro DRAW_INIT
{
mov eax,[zb]
mov eax,[eax+offs_zbuf_current_texture]
mov [texture],eax
; texture=zb->current_texture;
}
 
macro PUT_PIXEL _a
{
local .end_0
; float zinv;
; int s,t;
mov eax,[z]
shr eax,ZB_POINT_Z_FRAC_BITS
mov [zz],eax
mov ebx,[pz]
cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
jl .end_0
; zz=z >> ZB_POINT_Z_FRAC_BITS;
; if (zz >= pz[_a]) {
; zinv= 1.0 / (float) z;
; s= (int) (sz * zinv);
; t= (int) (tz * zinv);
; pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
; pz[_a]=zz;
fild dword[z]
fld dword[s_z]
fdiv st0,st1
;fistp dword[...s...] ;s = (int) (s_z / (float) z)
; t= (int) (t_z / (float) z);
; pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
.end_0:
; }
mov eax,[dzdx]
add [z],eax
fld dword[dszdx]
fadd dword[s_z]
fstp dword[s_z]
fld dword,[dtzdx]
fadd dword[t_z]
fstp dword[t_z]
mov eax,[dszdx]
add [sz],eax
mov eax,[dtzdx]
add [tz],eax
}
 
align 4
/programs/develop/libraries/TinyGL/asm_fork/ztriangle.inc
19,27 → 19,27
update_left dd ?
update_right dd ?
 
nb_lines dd ? ;число горизонтальных линий в половине треугольника
nb_lines dd ?
dx1 dd ?
dy1 dd ?
;dx2 dd ?
dx2 dd ?
dy2 dd ?
 
error dd ? ;int
derror dd ? ;int
x1 dd ? ;int
dxdy_min dd ? ;int
dxdy_max dd ? ;int
error dd ?
derror dd ?
x1 dd ?
dxdy_min dd ?
dxdy_max dd ?
; warning: x2 is multiplied by 2^16
x2 dd ? ;int
dx2dy2 dd ? ;int
x2 dd ?
dx2dy2 dd ?
 
if INTERP_Z eq 1
z1 dd ? ;int
dzdx dd ? ;int
dzdy dd ? ;int
dzdl_min dd ? ;int
dzdl_max dd ? ;int
z1 dd ?
dzdx dd ?
dzdy dd ?
dzdl_min dd ?
dzdl_max dd ?
end if
if INTERP_RGB eq 1
r1 dd ? ;int
59,16 → 59,16
dbdl_max dd ?
end if
if INTERP_ST eq 1
s1 dd ? ;int
dsdx dd ? ;int
dsdy dd ? ;int
dsdl_min dd ? ;int
dsdl_max dd ? ;int
t1 dd ? ;int
dtdx dd ? ;int
dtdy dd ? ;int
dtdl_min dd ? ;int
dtdl_max dd ? ;int
s1 dd ?
dsdx dd ?
dsdy dd ?
dsdl_min dd ?
dsdl_max dd ?
t1 dd ?
dtdx dd ?
dtdy dd ?
dtdl_min dd ?
dtdl_max dd ?
end if
if INTERP_STZ eq 1
sz1 dd ? ;float
83,11 → 83,11
dtzdl_max dd ? ;float
end if
 
 
if DRAW_LINE_M eq 1
DRAW_LINE 0 ;переменные делаются в макросе
else
n dd ? ;int - длинна горизонтальной линии в пикселях
;edi = pp dd ?
n dd ? ;int
if INTERP_Z eq 1
pz dd ? ;unsigned short *
z dd ? ;uint
109,36 → 109,41
end if
 
endl
pushad
 
if DEBUG ;(1)
stdcall dbg_print,f_fill_tr,m_1
end if
 
; we sort the vertex with increasing y
mov ebx,[p0]
mov ecx,[p1]
mov eax,[ebx+offs_zbup_y]
cmp [ecx+offs_zbup_y],eax
jge @f
;if (p1.y < p0.y)
mov [p0],ecx
mov [p1],ebx
xchg ebx,ecx
mov eax,[ebx+offs_zbup_y] ;обновляем p0.y для следующего сравнения
@@:
mov edx,[p2]
mov eax,[edx+offs_zbup_y]
cmp [ecx+offs_zbup_y],eax ;(2-1)
jle @f
xchg edx,ecx
cmp [edx+offs_zbup_y],eax
jge @f
;if (p2.y < p0.y)
mov [p0],edx
mov [p1],ebx
mov [p2],ecx
mov ebx,[p0]
mov ecx,[p1]
mov edx,[p2]
jmp .end_e0
@@:
mov eax,[ecx+offs_zbup_y]
cmp [ebx+offs_zbup_y],eax ;(1-0)
jle @f
xchg ecx,ebx
@@:
mov eax,[edx+offs_zbup_y]
cmp [ecx+offs_zbup_y],eax ;(2-1)
jle @f
xchg edx,ecx
@@:
mov [p0],ebx
mov [p1],ecx
mov [p2],edx
cmp [edx+offs_zbup_y],eax
jge .end_e0
;else if (p2.y < p1.y)
mov [p1],edx
mov [p2],ecx
.end_e0:
 
; we compute dXdx and dXdy for all interpolated values
 
mov eax,[ecx+offs_zbup_x]
sub eax,[ebx+offs_zbup_x]
mov [fdx1],eax ;p1.x - p0.x
153,26 → 158,23
sub eax,[ebx+offs_zbup_y]
mov [fdy2],eax ;p2.y - p0.y
 
fild dword[fdx2]
fst dword[fdx2]
fild dword[fdy1]
fst dword[fdy1]
fmulp
fild dword[fdx1]
fst dword[fdx1]
fild dword[fdy2]
fst dword[fdy2]
fmulp
fild dword[fdx2]
fst dword[fdx2]
fild dword[fdy1]
fst dword[fdy1]
fmulp
fsubp ;st0 = st1-st0
fsubp ;st0 = st0-st1
fst dword[fz] ;fz = fdx1 * fdy2 - fdx2 * fdy1
fldz
fcompp ;if (fz == 0) return
fcompp ;if (fz == 0)
fstsw ax
sahf
je .end_f
if DEBUG ;(2)
stdcall dbg_print,txt_sp,m_2
end if
fld1
fdiv dword[fz] ;fz = 1.0 / fz
fst dword[fz] ;st0 = fz
199,25 → 201,27
mov eax,[edx+offs_zbup_z]
sub eax,[ebx+offs_zbup_z]
mov [d2],eax
fild dword[d1] ;d1 = p1.z - p0.z
fild dword[d2] ;d2 = p2.z - p0.z
fild dword[d1]
fst dword[d1] ;d1 = p1.z - p0.z
fild dword[d2]
fst dword[d2] ;d2 = p2.z - p0.z
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st3
fsub st0,st1
fistp dword[dzdx] ;dzdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdy1]
fld dword[fdx1]
fmul st0,st2
fsubp
fistp dword[dzdx] ;dzdx = (int) (fdy2*d1 - fdy1*d2)
fld dword[fdx1]
fmul st0,st1
fld dword[fdx2]
fmul st0,st3
fsubp
fsub st0,st1
fistp dword[dzdy] ;dzdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0 ;free d2
ffree st0
fincstp
ffree st0 ;free d1
fincstp
end if
 
if INTERP_RGB eq 1
227,25 → 231,27
mov eax,[edx+offs_zbup_r]
sub eax,[ebx+offs_zbup_r]
mov [d2],eax
fild dword[d1] ;d1 = p1.r - p0.r
fild dword[d2] ;d2 = p2.r - p0.r
fild dword[d1]
fst dword[d1] ;d1 = p1.r - p0.r
fild dword[d2]
fst dword[d2] ;d2 = p2.r - p0.r
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st3
fsub st0,st1
fistp dword[drdx] ;drdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdy1]
fld dword[fdx1]
fmul st0,st2
fsubp
fistp dword[drdx] ;drdx = (int) (fdy2*d1 - fdy1*d2)
fld dword[fdx1]
fmul st0,st1
fld dword[fdx2]
fmul st0,st3
fsubp
fsub st0,st1
fistp dword[drdy] ;drdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0 ;free d2
ffree st0
fincstp
ffree st0 ;free d1
fincstp
 
mov eax,[ecx+offs_zbup_g]
sub eax,[ebx+offs_zbup_g]
253,25 → 259,27
mov eax,[edx+offs_zbup_g]
sub eax,[ebx+offs_zbup_g]
mov [d2],eax
fild dword[d1] ;d1 = p1.g - p0.g
fild dword[d2] ;d2 = p2.g - p0.g
fild dword[d1]
fst dword[d1] ;d1 = p1.g - p0.g
fild dword[d2]
fst dword[d2] ;d2 = p2.g - p0.g
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st3
fsub st0,st1
fistp dword[dgdx] ;dgdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdy1]
fld dword[fdx1]
fmul st0,st2
fsubp
fistp dword[dgdx] ;dgdx = (int) (fdy2*d1 - fdy1*d2)
fld dword[fdx1]
fmul st0,st1
fld dword[fdx2]
fmul st0,st3
fsubp
fsub st0,st1
fistp dword[dgdy] ;dgdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0 ;free d2
ffree st0
fincstp
ffree st0 ;free d1
fincstp
 
mov eax,[ecx+offs_zbup_b]
sub eax,[ebx+offs_zbup_b]
279,25 → 287,27
mov eax,[edx+offs_zbup_b]
sub eax,[ebx+offs_zbup_b]
mov [d2],eax
fild dword[d1] ;d1 = p1.b - p0.b
fild dword[d2] ;d2 = p2.b - p0.b
fild dword[d1]
fst dword[d1] ;d1 = p1.b - p0.b
fild dword[d2]
fst dword[d2] ;d2 = p2.b - p0.b
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st3
fsub st0,st1
fistp dword[dbdx] ;dbdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdy1]
fld dword[fdx1]
fmul st0,st2
fsubp
fistp dword[dbdx] ;dbdx = (int) (fdy2*d1 - fdy1*d2)
fld dword[fdx1]
fmul st0,st1
fld dword[fdx2]
fmul st0,st3
fsubp
fsub st0,st1
fistp dword[dbdy] ;dbdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0 ;free d2
ffree st0
fincstp
ffree st0 ;free d1
fincstp
end if
 
if INTERP_ST eq 1
307,15 → 317,19
mov eax,[edx+offs_zbup_s]
sub eax,[ebx+offs_zbup_s]
mov [d2],eax
fild dword[d1] ;d1 = p1.s - p0.s
fild dword[d2] ;d2 = p2.s - p0.s
fild dword[d1]
fst dword[d1] ;d1 = p1.s - p0.s
fild dword[d2]
fst dword[d2] ;d2 = p2.s - p0.s
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st2
fld dword[fdy1]
fmul st0,st2
fsubp
fmul st0,st3
fsub st0,st1
fistp dword[dsdx] ;dsdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdx1]
324,10 → 338,6
fistp dword[dsdy] ;dsdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0
fincstp
ffree st0 ;free d2
fincstp
ffree st0 ;free d1
fincstp
 
mov eax,[ecx+offs_zbup_t]
sub eax,[ebx+offs_zbup_t]
335,8 → 345,10
mov eax,[edx+offs_zbup_t]
sub eax,[ebx+offs_zbup_t]
mov [d2],eax
fild dword[d1] ;d1 = p1.t - p0.t
fild dword[d2] ;d2 = p2.t - p0.t
fild dword[d1]
fst dword[d1] ;d1 = p1.t - p0.t
fild dword[d2]
fst dword[d2] ;d2 = p2.t - p0.t
 
fld dword[fdy1]
fmul st0,st1
354,10 → 366,6
fistp dword[dtdy] ;dtdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0
fincstp
ffree st0 ;free d2
fincstp
ffree st0 ;free d1
fincstp
end if
 
if INTERP_STZ eq 1
366,8 → 374,10
fmul st0,st1
fstp dword[ebx+offs_zbup_sz] ;p0.sz = (float) p0.s * p0.z
fild dword[ebx+offs_zbup_t]
fmulp
fmul st0,st1
fstp dword[ebx+offs_zbup_tz] ;p0.tz = (float) p0.t * p0.z
ffree st0
fincstp
 
fild dword[ecx+offs_zbup_z]
fild dword[ecx+offs_zbup_s]
374,8 → 384,10
fmul st0,st1
fstp dword[ecx+offs_zbup_sz] ;p1.sz = (float) p1.s * p1.z
fild dword[ecx+offs_zbup_t]
fmulp
fmul st0,st1
fstp dword[ecx+offs_zbup_tz] ;p1.tz = (float) p1.t * p1.z
ffree st0
fincstp
 
fild dword[edx+offs_zbup_z]
fild dword[edx+offs_zbup_s]
382,37 → 394,41
fmul st0,st1
fstp dword[edx+offs_zbup_sz] ;p2.sz = (float) p2.s * p2.z
fild dword[edx+offs_zbup_t]
fmulp
fmul st0,st1
fstp dword[edx+offs_zbup_tz] ;p2.tz = (float) p2.t * p2.z
ffree st0
fincstp
 
fld dword[ecx+offs_zbup_sz]
fsub dword[ebx+offs_zbup_sz] ;d1 = p1.sz - p0.sz
fsub dword[ebx+offs_zbup_sz]
fst dword[d1] ;d1 = p1.sz - p0.sz
fld dword[edx+offs_zbup_sz]
fsub dword[ebx+offs_zbup_sz] ;d2 = p2.sz - p0.sz
fsub dword[ebx+offs_zbup_sz]
fst dword[d2] ;d2 = p2.sz - p0.sz
 
fld dword[fdy1]
fmul st0,st1
fld dword[fdy2]
fmul st0,st2
fld dword[fdy1]
fmul st0,st2
fsubp
fstp dword[dszdx] ;dszdx = (fdy2*d1 - fdy1*d2)
fmul st0,st3
fsub st0,st1
fistp dword[dszdx] ;dszdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
fmul st0,st2
fld dword[fdx1]
fmul st0,st2
fsub st0,st1
fstp dword[dszdy] ;dszdy = (fdx1*d2 - fdx2*d1)
fistp dword[dszdy] ;dszdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0
fincstp
ffree st0 ;free d2
fincstp
ffree st0 ;free d1
fincstp
 
fld dword[ecx+offs_zbup_tz]
fsub dword[ebx+offs_zbup_tz] ;d1 = p1.tz - p0.tz
fsub dword[ebx+offs_zbup_tz]
fst dword[d1] ;d1 = p1.tz - p0.tz
fld dword[edx+offs_zbup_tz]
fsub dword[ebx+offs_zbup_tz] ;d2 = p2.tz - p0.tz
fsub dword[ebx+offs_zbup_tz]
fst dword[d2] ;d2 = p2.tz - p0.tz
 
fld dword[fdy1]
fmul st0,st1
419,7 → 435,7
fld dword[fdy2]
fmul st0,st3
fsub st0,st1
fstp dword[dtzdx] ;dtzdx = (fdy2*d1 - fdy1*d2)
fistp dword[dtzdx] ;dtzdx = (int) (fdy2*d1 - fdy1*d2)
ffree st0
fincstp
fld dword[fdx2]
427,16 → 443,13
fld dword[fdx1]
fmul st0,st2
fsub st0,st1
fstp dword[dtzdy] ;dtzdy = (fdx1*d2 - fdx2*d1)
fistp dword[dtzdy] ;dtzdy = (int) (fdx1*d2 - fdx2*d1)
ffree st0
fincstp
ffree st0 ;free d2
fincstp
ffree st0 ;free d1
fincstp
end if
 
; screen coordinates
 
mov eax,[zb]
mov edx,[eax+offs_zbuf_linesize]
imul edx,[ebx+offs_zbup_y]
452,13 → 465,10
 
mov dword[part],0
.cycle_0:
if DEBUG ;(3)
stdcall dbg_print,txt_sp,m_3
end if
mov ebx,[p0]
mov ecx,[p1]
mov edx,[p2]
cmp dword[part],0 ;if (part == 0)
cmp dword[part],0
jne .els_0
mov dword[update_left],1
mov dword[update_right],1
483,6 → 493,8
jmp .end_0
.els_0:
; second part
mov dword[update_left],0
mov dword[update_right],1
fldz
fld dword[fz]
fcompp ;if (fz > 0)
489,14 → 501,10
fstsw ax
sahf
jbe .els_2
mov dword[update_left],0
mov dword[update_right],1
mov [pr1],ecx
mov [pr2],edx
jmp .end_2
.els_2:
mov dword[update_left],1
mov dword[update_right],0
mov [l1],ecx
mov [l2],edx
.end_2:
507,78 → 515,37
.end_0:
 
; compute the values for the left edge
 
cmp dword[update_left],0 ;if (update_left)
je .end_upd_l
mov ebx,[l1]
mov ecx,[l2]
mov edx,[ecx+offs_zbup_y]
sub edx,[ebx+offs_zbup_y]
mov [dy1],edx ;dy1 = l2.y - l1.y
mov eax,[ecx+offs_zbup_x]
sub eax,[ebx+offs_zbup_x]
mov [dx1],eax ;dx1 = l2.x - l1.x
cmp edx,0 ;if (dy1 > 0)
mov eax,[ecx+offs_zbup_y]
sub eax,[ebx+offs_zbup_y]
mov [dy1],eax ;dy1 = l2.y - l1.y
cmp eax,0 ;if (dy1 > 0)
jle .els_3
mov eax,[dx1]
shl eax,16
xor edx,edx
cmp eax,0
jl .otr_dx1
shl eax,16
div dword[dy1] ;eax = (dx1 << 16) / dy1
jmp .end_3
.otr_dx1:
neg eax
inc eax
shl eax,16
div dword[dy1] ;eax = (-dx1 << 16) / dy1
neg eax
inc eax
jmp .end_3
.els_3:
xor eax,eax
.end_3:
mov edx,[ebx+offs_zbup_x]
mov [x1],edx ;x1 = l1.x
mov dword[error],0 ;error = 0
mov [x1],edx
mov dword[error],0
mov dword[derror],eax
and dword[derror],0xffff ;derror = eax & 0x0000ffff
and dword[derror],0xffff
shr eax,16
mov [dxdy_min],eax ;dxdy_min = eax >> 16
mov [dxdy_min],eax
inc eax
mov [dxdy_max],eax
 
if DEBUG ;(4) update_left [dx1], [dy1], [dxdy_min], [dxdy_max]
push ecx edi
mov ecx,80
lea edi,[buf_param]
mov eax,[dx1]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[dy1]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[dxdy_min]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[dxdy_max]
stdcall convert_int_to_str,ecx
 
stdcall str_n_cat,edi,txt_nl,2
stdcall dbg_print,m_4,buf_param
pop edi ecx
end if
 
if INTERP_Z eq 1
mov eax,[l1]
mov eax,[eax+offs_zbup_z]
618,6 → 585,7
mov [dbdl_min],eax ;dbdl_min = (dbdy +dbdx*dxdy_min)
add eax,[dbdx]
mov [dbdl_max],eax ;dbdl_max = dbdl_min +dbdx
 
end if
if INTERP_ST eq 1
mov ebx,[l1]
667,86 → 635,30
je .end_upd_r
mov ebx,[pr1]
mov ecx,[pr2]
mov edx,[ebx+offs_zbup_x]
mov eax,[ecx+offs_zbup_x]
sub eax,edx
;mov [dx2],eax ;dx2 = pr2.x - pr1.x
shl edx,16
mov [x2],edx ; x2 = pr1.x << 16
mov edx,[ecx+offs_zbup_y]
sub edx,[ebx+offs_zbup_y]
mov [dy2],edx ;dy2 = pr2.y - pr1.y
cmp edx,0 ;if (dy2 > 0)
sub eax,[ebx+offs_zbup_x]
mov [dx2],eax ;dx2 = pr2.x - pr1.x
mov eax,[ecx+offs_zbup_y]
sub eax,[ebx+offs_zbup_y]
mov [dy2],eax ;dy2 = pr2.y - pr1.y
cmp eax,0 ;if (dy2 > 0)
jle .els_4
mov eax,[dx2]
shl eax,16
xor edx,edx
cmp eax,0
jl .otr_dx2
shl eax,16
div dword[dy2] ;eax = (dx2 << 16) / dy2
jmp .end_4
.otr_dx2:
neg eax
inc eax ;dx2 *= -1
shl eax,16
div dword[dy2] ;eax = (-dx2 << 16) / dy2
neg eax
inc eax
jmp .end_4
.els_4:
xor eax,eax
.end_4:
mov [dx2dy2],eax
 
if DEBUG ;(5) update_right [dx2dy2], [dy2], [pr1.x], [pr2.x]
push ecx edi
mov eax,[dx2dy2]
shr eax,16
mov ecx,80
lea edi,[buf_param]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[dy2]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov ebx,[pr1]
mov eax,[ebx+offs_zbup_x]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov ebx,[pr2]
mov eax,[ebx+offs_zbup_x]
stdcall convert_int_to_str,ecx
 
stdcall str_n_cat,edi,txt_nl,2
stdcall dbg_print,m_5,buf_param
pop edi ecx
end if
shl eax,16
mov [x2],eax ; x2 = pr1.x << 16
.end_upd_r:
 
; we draw all the scan line of the part
if DEBUG ;[nb_lines]
push ecx edi
mov eax,[nb_lines]
mov ecx,80
lea edi,[buf_param]
stdcall convert_int_to_str,ecx
 
stdcall str_n_cat,edi,txt_nl,2
stdcall dbg_print,f_fill_tr_nl,buf_param
pop edi ecx
end if
 
.beg_w_lin:
cmp dword[nb_lines],0 ;while (nb_lines>0)
jle .end_w_lin
762,34 → 674,6
mov [n],eax ;n = (x2 >> 16) - x1
imul edi,PSZB
add edi,[pp1] ;pp = pp1 + x1 * PSZB
 
if DEBUG ;[n], [x1], [x2]>>16
push ecx edi
mov eax,[n]
mov ecx,80
lea edi,[buf_param]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[x1]
stdcall convert_int_to_str,ecx
stdcall str_n_cat,edi,txt_zp_sp,2
stdcall str_len,edi
add edi,eax
sub ecx,eax
 
mov eax,[x2]
shr eax,16
stdcall convert_int_to_str,ecx
 
stdcall str_n_cat,edi,txt_nl,2
stdcall dbg_print,f_fill_tr_nll,buf_param
pop edi ecx
end if
 
if INTERP_Z eq 1
mov eax,[x1]
shl eax,1
818,11 → 702,7
mov eax,[tz1]
mov [t_z],eax
end if
 
align 4
.cycle_1: ;while (n>=3)
cmp dword[n],3
jl .cycle_2
PUT_PIXEL 0
PUT_PIXEL 1
PUT_PIXEL 2
832,10 → 712,9
end if
add edi,4*PSZB
sub dword[n],4
jmp .cycle_1
cmp dword[n],3
jge .cycle_1
.cycle_2: ;while (n>=0)
cmp dword[n],0
jl .cycle_2_end
PUT_PIXEL 0
if INTERP_Z eq 1
add dword[pz],2 ;=sizeof(uint)
842,14 → 721,14
end if
add edi,PSZB
dec dword[n]
jmp .cycle_2
.cycle_2_end:
end if ;проверка от макроса DRAW_LINE
cmp dword[n],0
jge .cycle_2
end if
 
; left edge
mov eax,[derror]
add [error],eax
cmp dword[error],0 ;if (error > 0)
cmp eax,0 ;if (error > 0)
jle .els_er
sub dword[error],0x10000
mov eax,[dxdy_max]
929,7 → 808,6
cmp dword[part],2
jl .cycle_0
.end_f:
popad
ret
endp
 
/programs/develop/libraries/TinyGL/asm_fork/examples/test3.asm
File deleted
\ No newline at end of file