WebSVN – Kolibri OS – Diff – /programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm

 	mov [colorG],al ;colorG=p2.g>>8
 	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
+}
 macro PUT_PIXEL _a
 	mov ebx,[pz]
 	cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
 	jl .end_0
 		;edi = pp
-if TGL_FEATURE_RENDER_BITS eq 24
+		mov word[ebx+2*_a],ax ;пишем в буфер глубины новое значение
+if TGL_FEATURE_RENDER_BITS eq 24
 		mov cl,[colorR]
 		mov ch,[colorG]
 		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:
-	.end_0:
 	mov eax,[dzdx]
 	add [z],eax
+}
+}
 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
-;    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,[or1]
-;    }
+		mov cl,ah
-	mov eax,[dzdx]
+		mov eax,[og1]
-	add [z],eax
+		mov ch,ah
-;    og1+=dgdx;
+		mov word[edi+3*_a],cx
-;    or1+=drdx;
+		mov eax,[ob1]
-;    ob1+=dbdx;
+		mov byte[edi+3*_a +2],ah
+end if
-elseif TGL_FEATURE_RENDER_BITS eq 16
+if TGL_FEATURE_RENDER_BITS eq 16
-;    if (zz >= pz[_a]) {
 ;      tmp=rgb & 0xF81F07E0;
 ;      pp[_a]=tmp | (tmp >> 16);
-;      pz[_a]=zz;
-;    }
-;    z+=dzdx;
-;    rgb=(rgb+drgbdx) & ( ~ 0x00200800);
-else
+;else
-;    if (zz >= pz[_a]) {
 ;      pp[_a] = RGB_TO_PIXEL(or1, og1, ob1);
-;      pz[_a]=zz;
+end if
-;    }
+	.end_0:
 	mov eax,[dzdx]
 	add [z],eax
+if TGL_FEATURE_RENDER_BITS eq 16
+;    rgb=(rgb+drgbdx) & ( ~ 0x00200800);
+end if
+if TGL_FEATURE_RENDER_BITS <> 16
-;    og1+=dgdx;
+	mov eax,[dgdx]
+	add [og1],eax
-;    or1+=drdx;
+	mov eax,[drdx]
+	add [or1],eax
-;    ob1+=dbdx;
+	mov eax,[dbdx]
+	add [ob1],eax
 end if
+}
-DRAW_LINE_M equ 1
+;;;DRAW_LINE_M equ 1
+macro DRAW_LINE code
+{
-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
-if code eq 0
+	z dd ? ;uint
-;  register unsigned short *pz;
+	zz dd ? ;uint
-;  register PIXEL *pp;
+	rgb dd ? ;uint
-;  register unsigned int tmp,z,zz,rgb,drgbdx;
+	drgbdx dd ? ;uint
-;  register int n;
+	n dd ? ;int
+end if
+if code eq 1
+	mov eax,[x2]
-end if
+	shr eax,16
-if code eq 1
+	sub eax,[x1]
-;  n=(x2 >> 16) - x1;
+	mov [n],eax ;n = (x2 >> 16) - x1
 ;  pp=pp1+x1;
 ;  pz=pz1+x1;
 ;  z=z1;
 ;  rgb=(r1 << 16) & 0xFFC00000;
 ;  rgb|=(g1 >> 5) & 0x000007FF;
+;  rgb|=(b1 << 5) & 0x001FF000;
-;  rgb|=(b1 << 5) & 0x001FF000;
+;  drgbdx=_drgbdx;
+align 4
+	.cycle_0: ;while (n>=3)
-;  drgbdx=_drgbdx;
+	cmp dword[n],3
-;  while (n>=3) {
+	jl .cycle_1
-;    PUT_PIXEL(0);
+		PUT_PIXEL 0
-;    PUT_PIXEL(1);
+		PUT_PIXEL 1
-;    PUT_PIXEL(2);
+		PUT_PIXEL 2
-;    PUT_PIXEL(3);
+		PUT_PIXEL 3
-;    pz+=4;
+		add dword[pz],8
-;    pp+=4;
+		add edi,4
-;    n-=4;
+		sub [n],4
+	jmp .cycle_0
+	.cycle_1: ;while (n>=0)
-;  }
+	cmp dword[n],0
-;  while (n>=0) {
+	jl .cycle_1_end
-;    PUT_PIXEL(0);
+		PUT_PIXEL 0
-;    pz+=1;
+		add dword[pz],2
-;    pp+=1;
+		inc edi
+		dec dword[n]
-;    n-=1;
+		jmp .cycle_1
-;  }
+	.cycle_1_end:
 end if
 end if
 INTERP_ST equ 1
 macro DRAW_INIT
+{
+	mov eax,[zb]
-;  texture=zb->current_texture;
+	mov eax,[eax+offs_zbuf_current_texture]
+	mov [texture],eax
+}
 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
-;   zz=z >> ZB_POINT_Z_FRAC_BITS;
+;       pz[_a]=zz;
 if TGL_FEATURE_RENDER_BITS eq 24
-;   unsigned char *ptr;
-;     if (zz >= pz[_a]) {
+;   unsigned char *ptr;
 ;       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;
-;    }
+;       pp[3 * _a + 2]= ptr[2];
-else
-;     if (zz >= pz[_a]) {
+else
-;       pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
-;       pz[_a]=zz;
-;    }
+;       pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
+end if
-end if
+	.end_0:
 	mov eax,[dzdx]
 	add [z],eax
 	mov eax,[dsdx]
 	add [s],eax
 NB_INTERP equ 8
 macro DRAW_INIT
+{
-{
+	mov eax,[zb]
+	mov eax,[eax+offs_zbuf_current_texture]
-;  texture=zb->current_texture;
+	mov [texture],eax
+	fild dword[dzdx]
-;  fdzdx=(float)dzdx;
+	fstp dword[fdzdx]
 ;  fndzdx=NB_INTERP * fdzdx;
 ;  ndszdx=NB_INTERP * dszdx;
 ;  ndtzdx=NB_INTERP * dtzdx;
+}
+macro PUT_PIXEL _a
+{
-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
-;   zz=z >> ZB_POINT_Z_FRAC_BITS;
+;       pz[_a]=zz;
-if TGL_FEATURE_RENDER_BITS eq 24
-;   unsigned char *ptr;
+if TGL_FEATURE_RENDER_BITS eq 24
-;     if (zz >= pz[_a]) {
+;   unsigned char *ptr;
 ;       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;
+;       pp[3 * _a + 1]= ptr[1];
-;    }
-else
+;       pp[3 * _a + 2]= ptr[2];
-;     if (zz >= pz[_a]) {
+else
-;       pp[_a]=*(PIXEL *)((char *)texture+
-;               (((t & 0x3FC00000) | (s & 0x003FC000)) >> (17 - PSZSH)));
-;       pz[_a]=zz;
+;       pp[_a]=*(PIXEL *)((char *)texture+
+;           (((t & 0x3FC00000) | (s & 0x003FC000)) >> (17 - PSZSH)));
-;    }
+end if
-end if
+	.end_0:
 	mov eax,[dzdx]
 	add [z],eax
 	mov eax,[dsdx]
+{
 if TGL_FEATURE_RENDER_BITS eq 24
 if code eq 0
 	pz dd ? ;uint *
-	;edi = pp dd ?
+	s dd ? ;uint
-	s dd ? ;uint
 	t dd ? ;uint
 	z dd ? ;uint
 	zz dd ? ;uint
-	n dd ? ;int
+	n1 dd ? ;int - длинна горизонтальной линии в пикселях
 	dsdx dd ? ;int
 	dtdx dd ? ;int
 	s_z dd ? ;float
 	t_z dd ? ;float
 	fz dd ? ;float
 	zinv dd ? ;float
 end if
 if code eq 1
-;  n=(x2>>16)-x1;
+;  n1=(x2>>16)-x1;
 ;  fz=(float)z1;
 ;  zinv=1.0 / fz;
 ;  pp=(pp1 + x1 * PSZB);
 ;  pz=pz1+x1;
 ;  z=z1;
 ;  sz=sz1;
 ;  tz=tz1;
-;  while (n>=(NB_INTERP-1)) {
+;  while (n1>=(NB_INTERP-1)) {
 ;    {
 ;      float ss,tt;
 ;      ss=(sz * zinv);
 ;      tt=(tz * zinv);
 ;      s=(int) ss;
 ;      t=(int) tt;
 ;    PUT_PIXEL(6);
 ;    PUT_PIXEL(7);
 ;    pz+=NB_INTERP;
 ;    pp=(pp + NB_INTERP * PSZB);
-;    n-=NB_INTERP;
+;    n1-=NB_INTERP;
 ;    sz+=ndszdx;
 ;    tz+=ndtzdx;
 ;  }
 ;    {
 ;      float ss,tt;
 ;      ss=(sz * zinv);
 ;      t=(int) tt;
 ;      dsdx= (int)( (dszdx - ss*fdzdx)*zinv );
 ;      dtdx= (int)( (dtzdx - tt*fdzdx)*zinv );
 ;    }
-;  while (n>=0) {
+;  while (n1>=0) {
-;    PUT_PIXEL(0);
+;;;		PUT_PIXEL 0
 ;    pz+=1;
 ;    pp=(PIXEL *)((char *)pp + PSZB);
-;    n-=1;
+		dec dword[n1]
 ;  }
 end if
 end if
+}
 align 4
 proc ZB_fillTriangleMappingPerspective, zb:dword, p0:dword, p1:dword, p2:dword
 locals
 	texture dd ? ;PIXEL *
 	fdzdx dd ? ;float
-	fndzdx dd ?
+	fndzdx dd ? ;float
-	ndszdx dd ?
+	ndszdx dd ? ;float
-	ndtzdx dd ?
+	ndtzdx dd ? ;float
 include 'ztriangle.inc'
 end if
 INTERP_STZ equ 1
 macro DRAW_INIT
+{
+	mov eax,[zb]
-;  texture=zb->current_texture;
+	mov eax,[eax+offs_zbuf_current_texture]
+	mov [texture],eax
+}
 macro PUT_PIXEL _a
 {
-;   float zinv;
+local .end_0
+;   int s,t;
-;   int s,t;
+	mov eax,[z]
-;   zz=z >> ZB_POINT_Z_FRAC_BITS;
+	shr eax,ZB_POINT_Z_FRAC_BITS
-;     if (zz >= pz[_a]) {
+	mov [zz],eax
-;       zinv= 1.0 / (float) z;
+	mov ebx,[pz]
-;       s= (int) (sz * zinv);
+	cmp ax,word[ebx+2*_a] ;if (zz >= pz[_a])
-;       t= (int) (tz * zinv);
-;       pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
+	jl .end_0
+;       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);
-;       pz[_a]=zz;
+;       pp[_a]=texture[((t & 0x3FC00000) | s) >> 14];
-;    }
+	.end_0:
 	mov eax,[dzdx]
 	add [z],eax
-	mov eax,[dszdx]
+	fld dword[dszdx]
+	fadd dword[s_z]
-	add [sz],eax
+	fstp dword[s_z]
-	mov eax,[dtzdx]
+	fld dword,[dtzdx]
+	fadd dword[t_z]
-	add [tz],eax
+	fstp dword[t_z]
+}
 align 4

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm – Rev 5175 → 5187