RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix accidental change

This commit is contained in:
David Rose 2008-05-10 23:41:51 +00:00
parent 2459a7ddfc
commit e5d5c295c7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/tinydisplay/zbuffer.cxx
View File

@ -142,11 +142,11 @@ static void ZB_copyFrameBuffer5R6G5B(ZBuffer * zb,
void *buf, int linesize)
{
PIXEL *q;
unsigned char *p, *p1;
unsigned short *p, *p1;
int y, n;
q = zb->pbuf;
p1 = (unsigned char *) buf;
p1 = (unsigned short *) buf;
for (y = 0; y < zb->ysize; y++) {
p = p1;
@ -159,7 +159,7 @@ static void ZB_copyFrameBuffer5R6G5B(ZBuffer * zb,
q += 4;
p += 4;
} while (--n > 0);
p1 = (unsigned char *)((char *)p1 + linesize);
p1 = (unsigned short *)((char *)p1 + linesize);
}
}
@ -222,7 +222,7 @@ void memset_s(void *adr, int val, int count)
{
int i, n, v;
unsigned int *p;
unsigned char *q;
unsigned short *q;
p = (unsigned int *)adr;
v = val | (val << 16);
@ -236,7 +236,7 @@ void memset_s(void *adr, int val, int count)
p += 4;
}
q = (unsigned char *) p;
q = (unsigned short *) p;
n = count & 7;
for (i = 0; i < n; i++)
*q++ = val;

2
panda/src/tinydisplay/zgl.h
View File

@ -208,7 +208,7 @@ void gl_eval_viewport(GLContext *c);
void gl_vertex_transform(GLContext * c, GLVertex * v);
/* image_util.c */
void gl_convertRGB_to_5R6G5B(unsigned char *pixmap,unsigned char *rgb,
void gl_convertRGB_to_5R6G5B(unsigned short *pixmap,unsigned char *rgb,
int xsize,int ysize);
void gl_convertRGB_to_8A8R8G8B(unsigned int *pixmap, unsigned char *rgb,
int xsize, int ysize);