mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Finish initial conversion from Photon 1 to Photon 2. 

Force all off-screen drawing to be done in video card RAM instead of main
system RAM using Pd functions instead of Pm functions. PHOTON ONLY
r=kedl
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com 2000-02-09 14:07:54 +00:00
Родитель fcc693c42f
Коммит 3fecdf94ef
5 изменённых файлов: 75 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

88
gfx/src/photon/nsDrawingSurfacePh.cpp
Просмотреть файл

@ -1,3 +1,5 @@
int kedl=0;
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Netscape Public
@ -85,8 +87,20 @@ nsDrawingSurfacePh :: ~nsDrawingSurfacePh()
if (mIsOffscreen)
{
mMC->dc.gc = NULL; /* leave gc for now (leaks "less") */
PmMemReleaseMC( mMC); /* this function releases the GC */
// mMC->dc.gc=0; // leave gc for now (leaks "less")
//xyz PmMemReleaseMC( mMC); /* this function has an error! */
if (mDrawContext)
{
//printf ("release DC: %p\n",mDrawContext);
PhDCSetCurrent( moldDrawContext );
// PhDCSetCurrent(NULL);
// PgSetGC(mGC);
// PgSetRegion(mGC->rid);
mDrawContext->gc=0;
PdReleaseDirectContext((PdDirectContext_t *)mDrawContext); /* this function has an error! */
mDrawContext=0;
}
// free(mMC);
mMC = nsnull;
PgShmemDestroy( mPixmap->image );
mPixmap->image = nsnull;
@ -117,6 +131,8 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Lock(PRInt32 aX, PRInt32 aY,
void **aBits, PRInt32 *aStride,
PRInt32 *aWidthBytes, PRUint32 aFlags)
{
printf ("kedl: uhoh, calling lock!............................................................\n");
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Lock this=<%p> mLocked=<%d>\n", this, mLocked));
if (mLocked)
@ -134,7 +150,7 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Lock(PRInt32 aX, PRInt32 aY,
PhImage_t *image;
PhDim_t dim;
short bytes_per_pixel = 3;
short bytes_per_pixel = 4;
image = (PhImage_t *) PR_CALLOC( sizeof(PhImage_t) );
if (image == NULL)
@ -151,7 +167,7 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Lock(PRInt32 aX, PRInt32 aY,
/* Force all the Draw Events out to the image */
Flush();
image->type = Pg_IMAGE_DIRECT_888; // 3 bytes per pixel with this type
image->type = Pg_IMAGE_DIRECT_8888; // 4 bytes per pixel with this type
image->size = dim;
image->image = (char *) PR_Malloc( dim.w * dim.h * bytes_per_pixel);
if (image->image == NULL)
@ -164,13 +180,13 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Lock(PRInt32 aX, PRInt32 aY,
for (int y=0; y<dim.h; y++)
{
memcpy( image->image+y*dim.w*3,
mPixmap->image+3*mLockX+(mLockY+y)*mPixmap->bpl,
dim.w*3);
memcpy( image->image+y*dim.w*bytes_per_pixel,
mPixmap->image+bytes_per_pixel*mLockX+(mLockY+y)*mPixmap->bpl,
dim.w*bytes_per_pixel);
}
*aBits = mImage->image;
*aWidthBytes = aWidth*3;
*aWidthBytes = aWidth*bytes_per_pixel;
*aStride = mImage->bpl; /* kirkj: I think this is wrong... */
return NS_OK;
@ -298,7 +314,7 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Init( PhGC_t * &aGC, PRUint32 aWidth,
mHeight = aHeight;
mFlags = aFlags;
mIsOffscreen = PR_TRUE;
mIsOffsc*‰ŠPR_TRUE;
PhDim_t dim;
PhArea_t area;
@ -336,15 +352,15 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Init( PhGC_t * &aGC, PRUint32 aWidth,
/*
* Kedl thinks this fixes a bug on test 2
*/
dim.w ++;
// dim.w ++;
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Init create drawing surface: area=<%d,%d,%d,%d> mPixmap=<%p>\n",
area.pos.x,area.pos.y,area.size.w,area.size.h,mPixmap));
PhPoint_t translation = { 0, 0 };
short bytes_per_pixel = 3;
short bytes_per_pixel = 4;
mPixmap->type = Pg_IMAGE_DIRECT_888; // 3 bytes per pixel with this type
mPixmap->type = Pg_IMAGE_DIRECT_8888; // 4 bytes per pixel with this type
mPixmap->size = dim;
mPixmap->image = (char *) PgShmemCreate( dim.w * dim.h * bytes_per_pixel, NULL);
@ -360,13 +376,29 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Init( PhGC_t * &aGC, PRUint32 aWidth,
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Init Before calling PmMemCreateMC\n"));
mMC = PmMemCreateMC( mPixmap, &dim, &translation );
moldDrawContext = PhDCGetCurrent();
/* Some cards need to be forced to 2048 to work right... */
//mDrawContext = (PhDrawContext_t *)PdCreateOffscreenContext( 0 ,dim.w,dim.h,0);
//mDrawContext = (PhDrawContext_t *)PdCreateOffscreenContext( 0 ,2048,dim.h,0);
mDrawContext = (PhDrawContext_t *)PdCreateOffscreenContext( 0 ,1024,dim.h,0);
//printf ("kedl: create pd....................................... %d, %p\n",kedl++,mDrawContext);
if (mDrawContext == NULL)
{
NS_ASSERTION(0, "nsDrawingSurfacePh::Init Out of Memory calling PdCreateOffscreenContext");
abort();
return NS_ERROR_FAILURE;
}
/*xyz
if (mMC == NULL)
{
NS_ASSERTION(0, "nsDrawingSurfacePh::Init Out of Memory calling PmMemCreateMC");
abort();
return NS_ERROR_FAILURE;
}
*/
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Init mMC=<%p> mDrawContext=<%p> CurrentMC=<%p>\n", mMC, mDrawContext, PhDCGetCurrent()));
@ -375,7 +407,9 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Init( PhGC_t * &aGC, PRUint32 aWidth,
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Init Before calling PmMemStart this=<%p>\n", this));
// after the Start all drawing goes into the memory context
oldDC = PmMemStart( mMC );
//xyz oldDC = PmMemStart( mMC );
//printf ("PhDCSetCurrent 1: %p\n",mDrawContext);
oldDC = PhDCSetCurrent( (PdDirectContext_t *)mDrawContext );
if (oldDC == NULL)
{
NS_ASSERTION(0, "nsDrawingSurfacePh::Init - Error calling PmMemStart");
@ -388,7 +422,7 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Init( PhGC_t * &aGC, PRUint32 aWidth,
//PmMemSetType(mMC, Pm_IMAGE_CONTEXT);
/* Save away the new DrawContext */
mDrawContext = PhDCGetCurrent();
//xyz mDrawContext = PhDCGetCurrent();
/* Code to clear the clipping from the GC */
/* Activate this GC */
@ -425,6 +459,12 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Select( void )
{
PhDrawContext_t *old_dc;
/* Reset the Draw Context */
// printf ("PhDCSetCurrent 2: %p\n",mDrawContext);
// PhDCSetCurrent(0); //777
// PgSetClipping( 0, NULL );
// PgSetMultiClip( 0, NULL );
// PgSetFillColor(0xffffff);
// PgDrawIRect( 0, 0, 50,50, Pg_DRAW_FILL_STROKE );
old_dc = PhDCSetCurrent(mDrawContext);
if (old_dc == NULL)
{
@ -442,7 +482,6 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Select( void )
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Select mDrawContext== CurrentDC\n"));
}
gc = PgGetGC();
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Select mGC=<%p> mMC=<%p> gc=<%p>\n", mGC, mMC, gc));
@ -452,6 +491,10 @@ NS_IMETHODIMP nsDrawingSurfacePh :: Select( void )
PgSetGC(mGC);
}
/* Clear out the Multi-clip, it will be reset if needed */
/* This fixed the toolbar drawing */
// PgSetMultiClip(0,NULL); /* Moved this to the Init section */
#ifdef DEBUG
PhRect_t *rect;
int rect_count;
@ -495,7 +538,8 @@ NS_IMETHODIMP nsDrawingSurfacePh::Stop(void)
/* Is my Memory Context even active? */
if (mDrawContext == dc)
{
theMC = PmMemStop( (PmMemoryContext_t *) mGC );
//xyz theMC = PmMemStop( (PmMemoryContext_t *) mGC );
//xyz theMC = PdDirectStop( (PdDirectContext_t *) mGC );
if (theMC == NULL)
{
NS_WARNING("nsDrawingSurfacePh::Stop - Error calling PmMemStop");
@ -517,6 +561,12 @@ PhGC_t *nsDrawingSurfacePh::GetGC(void)
return mGC;
}
PhDrawContext_t *nsDrawingSurfacePh::GetDC(void)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::GetGC this=<%p> mGC=<%p> mMC=<%p> mIsOffscreen=<%d>", this, mGC, mMC, mIsOffscreen));
return mDrawContext; // xyz
}
NS_IMETHODIMP nsDrawingSurfacePh::Flush(void)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsDrawingSurfacePh::Flush this=<%p> mIsOffscreen=<%d> mGC=<%p> mMC=<%p> mPixmap=<%p>\n", this, mIsOffscreen, mGC, mMC, mPixmap));
@ -525,15 +575,17 @@ NS_IMETHODIMP nsDrawingSurfacePh::Flush(void)
if (mIsOffscreen)
{
NS_ASSERTION(mMC, "nsDrawingSurfacePh::Flush mMC is NULL\n");
//xyz NS_ASSERTION(mMC, "nsDrawingSurfacePh::Flush mMC is NULL\n");
NS_ASSERTION(mPixmap, "nsDrawingSurfacePh::Flush mPixmap is NULL\n");
/*xyz
err = PmMemFlush( mMC, mPixmap );
if (err == -1)
{
NS_ASSERTION(0,"nsDrawingSurfacePh::Flush Invalid Memory Context");
abort();
}
*/
PgFlush(); /* not sure if I need this or not */
}

5
gfx/src/photon/nsDrawingSurfacePh.h
Просмотреть файл

@ -66,6 +66,7 @@ public:
/* The GC is not ref counted, make sure you know what your doing */
PhGC_t *GetGC(void);
PhDrawContext_t *GetDC(void);
/* Is this Drawing Surface Active? */
PRBool IsActive();
@ -78,8 +79,10 @@ private:
PRBool mIsOffscreen;
PhGC_t *mGC;
PmMemoryContext_t *mMC;
//xyz PmMemoryContext_t *mMC;
PdOffscreenContext_t *mMC;
PhDrawContext_t *mDrawContext;
PhDrawContext_t *moldDrawContext;
PRUint32 mWidth;
PRUint32 mHeight;

48
gfx/src/photon/nsFontMetricsPh.cpp
Просмотреть файл

@ -100,28 +100,6 @@ nsFontMetricsPh :: Init ( const nsFont& aFont, nsIAtom* aLangGroup,
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsFontMetricsPh::Init with nsFont: aFont.style = <%d>\n", aFont.style));
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsFontMetricsPh::Init with nsFont: aFont.size = <%d>\n", aFont.size));
#ifndef PHOTON2_ONLY
/* Now match the Face name requested with a face Photon has */
fontcount = PfQueryFonts('a', PHFONT_ALL_FONTS, fDetails, MAX_FONTDETAIL);
if (fontcount >= MAX_FONTDETAIL)
{
printf("nsFontMetricsPh::Init Font Array should be increased! fontcount=%d\n",fontcount);
}
if (fontcount)
{
for(index=0; index < fontcount; index++)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsFontMetricsPh::Init comparing <%s> with <%s>\n", str, fDetails[index].desc));
if (strncmp(str, fDetails[index].desc, strlen(str)) == 0)
{
ret_code = NS_OK;
break;
}
}
}
#endif
mFont = new nsFont(aFont);
mLangGroup = aLangGroup;
mDeviceContext = (nsDeviceContextPh *) aContext;
@ -152,7 +130,6 @@ nsFontMetricsPh :: Init ( const nsFont& aFont, nsIAtom* aLangGroup,
NSFontSuffix[0] = nsnull;
#if defined(PHOTON2_ONLY)
unsigned int uiFlags = 0L;
if(aFont.weight > NS_FONT_WEIGHT_NORMAL)
@ -163,37 +140,12 @@ nsFontMetricsPh :: Init ( const nsFont& aFont, nsIAtom* aLangGroup,
//uiFlags |= PF_STYLE_ANTIALIAS; // kedl, for now this looks really bad
if(PfGenerateFontName((const uchar_t *)str, uiFlags, sizePoints, (uchar_t *)NSFullFontName) == NULL)
{
printf("Name generate failed: %s, %d, %d\n", str, uiFlags, sizePoints);
PfGenerateFontName((const uchar_t *)"Courier 10 Pitch BT",
uiFlags, sizePoints, (uchar_t *)NSFullFontName);
}
#else
if (ret_code == NS_OK)
sprintf(NSFontName, "%s%d",fDetails[index].stem, sizePoints);
else
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsFontMetricsPh::Init with nsFont: Unknown font using helv\n"));
sprintf(NSFontName, "helv%d",sizePoints); /* default font! should be a pref.*/
}
// if (aFont.weight >= NS_FONT_WEIGHT_BOLD) /* this is more correct! */
if (aFont.weight > NS_FONT_WEIGHT_NORMAL)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsFontMetricsPh::Init with nsFont: set font BOLD\n"));
strcat(NSFontSuffix,"b");
}
if (aFont.style & NS_FONT_STYLE_ITALIC)
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG, ("nsFontMetricsPh::Init with nsFont: set font ITALIC\n"));
strcat(NSFontSuffix,"i");
}
sprintf(NSFullFontName, "%s%s", NSFontName, NSFontSuffix);
#endif
/* Once the Photon Font String is built get the attributes */
FontQueryInfo fontInfo;

6
gfx/src/photon/nsImagePh.cpp
Просмотреть файл

@ -165,10 +165,6 @@ nsresult nsImagePh :: Init(PRInt32 aWidth, PRInt32 aHeight, PRInt32 aDepth,nsMas
mImage.size.w = mWidth;
mImage.size.h = mHeight;
mImage.palette_tag = 0; // REVISIT - A CRC value for PhRelay ???
#ifdef PHOTON1_ONLY
mImage.xscale = 1; // scaling is integral only
mImage.yscale = 1;
#endif
mImage.format = 0; // not used
mImage.flags = 0;
mImage.ghost_bpl = 0;
@ -504,7 +500,7 @@ NS_IMETHODIMP nsImagePh :: Draw(nsIRenderingContext &aContext, nsDrawingSurface
PhPoint_t pos = { aX, aY };
int err;
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsImagePh::Draw2 this=<%p> mImage.size=(%ld,%ld) mAlphaBits=<%p> mARowBytes=%d mImage.type=%d mImage.mask_bpl=%d\n", this, mImage.size.w, mImage.size.h, mAlphaBits, mARowBytes, mImage.type, mImage.mask_bpl));
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsImagePh::Draw2 this=<%p> mImage.size=(%ld,%ld) mAlphaBits=<%p> mARowBytes=%d mImage.type=%d m*‰Ťask_bpl=%d\n", this, mImage.size.w, mImage.size.h, mAlphaBits, mARowBytes, mImage.type, mImage.mask_bpl));
//printf("nsImagePh::Draw2 this=<%p> mImage.size=(%ld,%ld) mAlphaBits=<%p> mARowBytes=%d mImage.type=%d mImage.mask_bpl=%d\n", this, mImage.size.w, mImage.size.h, mAlphaBits, mARowBytes, mImage.type, mImage.mask_bpl);
if( mAlphaBits )

Двоичные данные
gfx/src/photon/nsRenderingContextPh.cpp
Просмотреть файл

Двоичный файл не отображается.