# HG changeset patch # User William Roberts # Date 1272031034 -3600 # Node ID 31d52bbe209c1938ce7e4ac403128b093498f4e8 # Parent 3aa07f06a4b7a07adaf07128345dfee257ab2da5# Parent 25f95128741d65adad54e1a964b3b5b00f0f3485 Merged in "Revision 201013" diff -r 3aa07f06a4b7 -r 31d52bbe209c egl/egltest/src/egltest_benchmark_sgimage.cpp --- a/egl/egltest/src/egltest_benchmark_sgimage.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/egl/egltest/src/egltest_benchmark_sgimage.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -875,6 +875,7 @@ void CEglTest_Benchmark_DrawImage::doProcessFunctionL(TInt aIdx) { + INFO_PRINTF2(_L("CEglTest_Benchmark_DrawImage::doProcessFunctionL, Process %d"),aIdx); #ifdef SYMBIAN_GRAPHICS_EGL_SGIMAGELITE GetDisplayL(); CreateEglSessionL(aIdx); diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/gdi/inc/GDI.H --- a/graphicsdeviceinterface/gdi/inc/GDI.H Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/gdi/inc/GDI.H Fri Apr 23 14:57:14 2010 +0100 @@ -2265,14 +2265,16 @@ Note: - The pen is used to draw lines, the outlines of filled shapes, and text. The - class provides member functions to set the colour of the pen, the style of + The pen is used to draw lines, the outlines of filled shapes, and text. In case + of outlined text, the pen is used to draw the outline of the font. + + The class provides member functions to set the colour of the pen, the style of line and the line size drawn. @param aColor An RGB colour for the pen. @see CGraphicsContext::SetDrawMode() */ virtual void SetPenColor(const TRgb& aColor)=0; - + /** Sets the line drawing style for the pen. There are 6 pen styles. If no pen style is set, then the default is @@ -2358,8 +2360,9 @@ Notes: - The brush is used for filling shapes and the background of text boxes. The - brush has colour, style, pattern and pattern origin parameters. + The brush is used for filling shapes and the background of text boxes. In + case of outlined text, the brush is used for filling the font. The brush + has colour, style, pattern and pattern origin parameters. If no brush colour has been set, it defaults to white. However the default brush style is null, so when drawing to a window the default appears to be diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sbit/BMDRAW16.CPP --- a/graphicsdeviceinterface/screendriver/sbit/BMDRAW16.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sbit/BMDRAW16.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-20010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -16,6 +16,7 @@ #include "BMDRAW.H" #include "BitDrawInterfaceId.h" #include +#include #if defined(SYMBIAN_USE_FAST_FADING) // 16bpp fast fade - half the contrast and brighten @@ -1427,9 +1428,6 @@ TUint32 aOutlinePenColor, TUint32 aShadowColor, TUint32 aFillColor, const TUint8* aDataBuffer) { - const TInt alpha = aOutlinePenColor >> 24; - if (alpha==0 || aLength<=0) - return(KErrNone); DeOrientate(aX,aY); TUint16* pixelPtr = PixelAddress(aX,aY); const TInt pixelPtrInc = LogicalPixelAddressIncrement(); @@ -1437,7 +1435,9 @@ TInt blendedRedColor; TInt blendedGreenColor; TInt blendedBlueColor; + TUint blendedAlpha; TUint32 finalColor; + const TUint16* normTable = PtrTo16BitNormalisationTable(); //Get red color. Equivalent to TRgb::Red() const TInt redOutlinePenColor = (aOutlinePenColor & 0xff0000) >> 16; @@ -1454,69 +1454,58 @@ const TInt blueShadowColor = aShadowColor & 0xff; const TInt blueFillColor = aFillColor & 0xff; + //Get alpha color. Equivalent to TRgb::Alpha() + const TUint alphaOutlinePenColor = aOutlinePenColor >> 24; + const TUint alphaShadowColor = aShadowColor >> 24; + const TUint alphaFillColor = aFillColor >> 24; + while (aDataBuffer < dataBufferPtrLimit) { TUint8 index = *aDataBuffer++; - if (255 == FourColorBlendLookup[index][KBackgroundColorIndex]) { //background colour - //No drawing required so move on to next pixel. - pixelPtr += pixelPtrInc; - continue; + //No drawing required } else if (255 == FourColorBlendLookup[index][KFillColorIndex]) { //Use fill colour to draw finalColor = aFillColor; + *pixelPtr = Blend32To16((finalColor | 0xff000000), alphaFillColor, *pixelPtr); } else if (255 == FourColorBlendLookup[index][KShadowColorIndex]) { //Use shadow colour to draw finalColor = aShadowColor; + *pixelPtr = Blend32To16((finalColor | 0xff000000), alphaShadowColor, *pixelPtr); } else if (255 == FourColorBlendLookup[index][KOutlineColorIndex]) { //Use outline colour to draw - finalColor = aOutlinePenColor; + finalColor = aOutlinePenColor; + *pixelPtr = Blend32To16((finalColor | 0xff000000), alphaOutlinePenColor, *pixelPtr); } else { //Get the background pixel colour. Using the lookup table to convert 16 to 32 bit colour - blendedRedColor = redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - redFillColor * FourColorBlendLookup[index][KFillColorIndex]; - - blendedGreenColor = greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - greenFillColor * FourColorBlendLookup[index][KFillColorIndex]; - - blendedBlueColor = blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - blueFillColor * FourColorBlendLookup[index][KFillColorIndex]; + blendedRedColor = (redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + redFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedGreenColor = (greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + greenFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedBlueColor = (blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + blueFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedAlpha = (alphaOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + + alphaShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + + alphaFillColor * FourColorBlendLookup[index][KFillColorIndex]) >> 8; - TInt backGroundAlpha=FourColorBlendLookup[index][KBackgroundColorIndex]; - if (backGroundAlpha) - { - const TUint8* pixelPtr8 = reinterpret_cast(pixelPtr); - const TUint8 low = *pixelPtr8++; - const TUint8 high = *pixelPtr8++; - TUint32 backgroundColor = (*(Convert16to32bppHigh() + high)) | (*(Convert16to32bppLow() + low)); - blendedRedColor += ((backgroundColor & 0xff0000) >> 16) * backGroundAlpha; - blendedGreenColor += ((backgroundColor & 0xff00) >> 8) * backGroundAlpha; - blendedBlueColor += (backgroundColor & 0xff) * backGroundAlpha; - } - //Equivalent to TRgb::TRgb(TUint32) - finalColor = ((blendedRedColor&0xFF00)<<8) | (blendedGreenColor&0xFF00) | (blendedBlueColor>>8); - } - - if (alpha == 0xff) - { - *pixelPtr = Conv32To16(finalColor); - } - else - { - *pixelPtr = Blend32To16NoChecks(finalColor, alpha, *pixelPtr); + finalColor = PMA2NonPMAPixel((blendedAlpha << 24) | (blendedRedColor << 16) | (blendedGreenColor << 8) | blendedBlueColor, normTable); + *pixelPtr = Blend32To16((finalColor | 0xff000000), blendedAlpha, *pixelPtr); } pixelPtr += pixelPtrInc; } diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sbit/BMDRAW24U.CPP --- a/graphicsdeviceinterface/screendriver/sbit/BMDRAW24U.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sbit/BMDRAW24U.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -16,6 +16,7 @@ #include "BMDRAW.H" #include "BitDrawInterfaceId.h" #include +#include TInt CDrawUTwentyFourBppBitmap::Construct(TSize aSize) { @@ -1184,9 +1185,6 @@ TUint32 aOutlinePenColor, TUint32 aShadowColor, TUint32 aFillColor, const TUint8* aDataBuffer) { - const TInt alpha = aOutlinePenColor >> 24; - if (alpha==0 || aLength<=0) - return KErrNone; DeOrientate(aX,aY); TUint32* pixelPtr = PixelAddress(aX,aY); const TInt pixelPtrInc = PixelAddressIncrement(); @@ -1194,8 +1192,10 @@ TInt blendedRedColor; TInt blendedGreenColor; TInt blendedBlueColor; + TInt blendedAlpha; TUint8 index = 0; TUint32 finalColor; + const TUint16* normTable = PtrTo16BitNormalisationTable(); //Get red color. Equivalent to TRgb::Red() const TInt redOutlinePenColor = (aOutlinePenColor & 0xff0000) >> 16; @@ -1212,72 +1212,58 @@ const TInt blueShadowColor = aShadowColor & 0xff; const TInt blueFillColor = aFillColor & 0xff; - const TUint32 mask2 = alpha | (alpha << 16); + //Get alpha color. Equivalent to TRgb::Alpha() + const TInt alphaOutlinePenColor = aOutlinePenColor >> 24; + const TInt alphaShadowColor = aShadowColor >> 24; + const TInt alphaFillColor = aFillColor >> 24; + while (aDataBuffer < dataBufferPtrLimit) { index = *aDataBuffer++; - if (255 == FourColorBlendLookup[index][KBackgroundColorIndex]) { //background colour - //No drawing required so move on to next pixel. - pixelPtr += pixelPtrInc; - continue; + //No drawing required } else if (255 == FourColorBlendLookup[index][KFillColorIndex]) { //Use fill colour to draw finalColor = aFillColor; + AlphaBlendPixelToDest((finalColor | 0xff000000), alphaFillColor, pixelPtr); } else if (255 == FourColorBlendLookup[index][KShadowColorIndex]) { //Use shadow colour to draw finalColor = aShadowColor; + AlphaBlendPixelToDest((finalColor | 0xff000000), alphaShadowColor, pixelPtr); } else if (255 == FourColorBlendLookup[index][KOutlineColorIndex]) { //Use outline colour to draw finalColor = aOutlinePenColor; + AlphaBlendPixelToDest((finalColor | 0xff000000), alphaOutlinePenColor, pixelPtr); } else { - TUint32 backgroundColor = *pixelPtr; - blendedRedColor = redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - redFillColor * FourColorBlendLookup[index][KFillColorIndex] + - ((backgroundColor & 0xff0000) >> 16) * FourColorBlendLookup[index][KBackgroundColorIndex]; + blendedRedColor = (redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + redFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedGreenColor = (greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + greenFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; - blendedGreenColor = greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - greenFillColor * FourColorBlendLookup[index][KFillColorIndex] + - ((backgroundColor & 0xff00) >> 8) * FourColorBlendLookup[index][KBackgroundColorIndex]; + blendedBlueColor = (blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + blueFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; - blendedBlueColor = blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - blueFillColor * FourColorBlendLookup[index][KFillColorIndex] + - (backgroundColor & 0xff) * FourColorBlendLookup[index][KBackgroundColorIndex]; + blendedAlpha = (alphaOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + + alphaShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + + alphaFillColor * FourColorBlendLookup[index][KFillColorIndex]) >> 8; - //Equivalent to TRgb::TRgb(TUint32) - finalColor = ((blendedRedColor&0xFF00) << 8) | (blendedGreenColor&0xFF00) | (blendedBlueColor>>8); + finalColor = PMA2NonPMAPixel((blendedAlpha << 24) | (blendedRedColor << 16) | (blendedGreenColor << 8) | blendedBlueColor, normTable); + AlphaBlendPixelToDest(finalColor | 0xff000000, blendedAlpha, pixelPtr); } - - if (alpha != 0xff) - { - TUint32 backgroundColor = *pixelPtr; - //Draw the final colour -// - const TUint32 s_rb = finalColor & 0x00FF00FF; - const TUint32 s_g = (finalColor & 0xFF00) >> 8; - const TUint32 d_rb = backgroundColor & 0x00FF00FF; - const TUint32 rb = ((((alpha * ((0x01000100 + s_rb) - d_rb)) >> 8) + d_rb) - mask2) & 0x00FF00FF; - - const TInt d_g = (backgroundColor & 0xFF00) >> 8; - const TInt g = ((alpha * (s_g - d_g)) >> 8) + d_g; - - finalColor = rb | (g<<8); - } - - *pixelPtr = (finalColor | 0xff000000); pixelPtr += pixelPtrInc; } return KErrNone; diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sbit/BMDRAW32A.CPP --- a/graphicsdeviceinterface/screendriver/sbit/BMDRAW32A.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sbit/BMDRAW32A.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,6 +14,8 @@ // #include "BMDRAW.H" +#include +#include /** Performs a blend based on the PD method, with 2* 16 bit in one 32 bit operation optimisation. @@ -37,6 +39,10 @@ I do this multiply after the CSrc*MulSrc, while I still have a 16bit intermediate result. It is possible to generate a faster, less accurate result by exhaustively finding the highest value that can be added instead of rb = rb+((rb>>8)&0x00ff00ff)+0x00800080; without causing an overflow. +@param aBeneath non-premultiplied color with alpha of the destination +@param aSrcColor non-premultiplied color with alpha of the source +@param aMaskBuffer mask +@return pre multiplied color resulting from the blending operation */ FORCEINLINE TUint32 OptimizedBlend32A(TUint32 aBeneath,TUint32 aSrcColor,TUint8 aMaskBuffer) { @@ -636,9 +642,11 @@ TInt blendedRedColor; TInt blendedGreenColor; TInt blendedBlueColor; + TInt blendedAlpha; TUint8 index = 0; TUint32 finalColor; - + const TUint16* normTable = PtrTo16BitNormalisationTable(); + //Get red color. Equivalent to TRgb::Red() const TInt redOutlinePenColor = (aOutlinePenColor & 0xff0000) >> 16; const TInt redShadowColor = (aShadowColor & 0xff0000) >> 16; @@ -653,7 +661,11 @@ const TInt blueOutlinePenColor = aOutlinePenColor & 0xff; const TInt blueShadowColor = aShadowColor & 0xff; const TInt blueFillColor = aFillColor & 0xff; - const TInt alpha = aOutlinePenColor >> 24; + + //Get alpha color. Equivalent to TRgb::Alpha() + const TInt alphaOutlinePenColor = aOutlinePenColor >> 24; + const TInt alphaShadowColor = aShadowColor >> 24; + const TInt alphaFillColor = aFillColor >> 24; while (aDataBuffer < dataBufferPtrLimit) { @@ -661,47 +673,53 @@ if(255 == FourColorBlendLookup[index][KBackgroundColorIndex]) { //background colour - //No drawing required so move on to next pixel. - pixelPtr += pixelPtrInc; - continue; + //No drawing required } else if (255 == FourColorBlendLookup[index][KFillColorIndex]) { //Use fill colour to draw - finalColor = aFillColor; + finalColor = OptimizedBlend32A(*pixelPtr, aFillColor, alphaFillColor); + *pixelPtr = PMA2NonPMAPixel(finalColor, normTable); } else if (255 == FourColorBlendLookup[index][KShadowColorIndex]) { //Use shadow colour to draw - finalColor = aShadowColor; + finalColor = OptimizedBlend32A(*pixelPtr, aShadowColor, alphaShadowColor); + *pixelPtr = PMA2NonPMAPixel(finalColor, normTable); } else if (255 == FourColorBlendLookup[index][KOutlineColorIndex]) { //Use outline colour to draw - finalColor = aOutlinePenColor; + finalColor = OptimizedBlend32A(*pixelPtr, aOutlinePenColor, alphaOutlinePenColor); + *pixelPtr = PMA2NonPMAPixel(finalColor, normTable); } else { - const TUint32 backgroundColor = *pixelPtr; - - blendedRedColor = (redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - redFillColor * FourColorBlendLookup[index][KFillColorIndex] + - ((backgroundColor & 0xff0000) >> 16) * FourColorBlendLookup[index][KBackgroundColorIndex]) >> 8; + blendedRedColor = (redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + redFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedGreenColor = (greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + greenFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedBlueColor = (blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + blueFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedAlpha = (alphaOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + + alphaShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + + alphaFillColor * FourColorBlendLookup[index][KFillColorIndex]) >> 8; - blendedGreenColor = (greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - greenFillColor * FourColorBlendLookup[index][KFillColorIndex] + - ((backgroundColor & 0xff00) >> 8) * FourColorBlendLookup[index][KBackgroundColorIndex]) >> 8; - - blendedBlueColor = (blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + - blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + - blueFillColor * FourColorBlendLookup[index][KFillColorIndex] + - (backgroundColor & 0xff) * FourColorBlendLookup[index][KBackgroundColorIndex]) >> 8; - - finalColor = (blendedRedColor << 16) | (blendedGreenColor << 8) | blendedBlueColor | 0xff000000; + // The blended colours have been alpha multiplied, hence the resulting colour is 16MAP + // Before doing the OptimizedBlend with the destination, note the following + // - The source alpha is set as fully opaque so that the blend is just with the mask + // - Input parameters for OptimizedBlend are NON-PRE, hence conversion from PRE to NON-PRE beforehand + // - output parameter for OptimizedBlend is PRE, hence conversion from PRE to NON-PRE afterwards + finalColor = PMA2NonPMAPixel((blendedAlpha << 24) | (blendedRedColor << 16) | (blendedGreenColor << 8) | blendedBlueColor, normTable); + finalColor = OptimizedBlend32A(*pixelPtr, finalColor | 0xff000000, blendedAlpha); + *pixelPtr = PMA2NonPMAPixel(finalColor, normTable); } - *pixelPtr = OptimizedBlend32A(*pixelPtr, finalColor, alpha); pixelPtr += pixelPtrInc; } return KErrNone; diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sbit/BMDRAW32PMA.cpp --- a/graphicsdeviceinterface/screendriver/sbit/BMDRAW32PMA.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sbit/BMDRAW32PMA.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -696,10 +696,6 @@ TUint32 aOutlinePenColor, TUint32 aShadowColor, TUint32 aFillColor, const TUint8* aDataBuffer) { - const TUint alphaShifted = aOutlinePenColor & 0xff000000; - const TUint alpha = alphaShifted>>24; - if (alpha==0 || aLength<=0) - return KErrNone; DeOrientate(aX,aY); TUint32* pixelPtr = PixelAddress(aX,aY); const TInt pixelPtrInc = PixelAddressIncrement(); @@ -707,6 +703,7 @@ TInt blendedRedColor; TInt blendedGreenColor; TInt blendedBlueColor; + TInt blendedAlpha; TUint8 index = 0; TUint32 finalColor; @@ -724,81 +721,63 @@ const TInt blueOutlinePenColor = aOutlinePenColor & 0xff; const TInt blueShadowColor = aShadowColor & 0xff; const TInt blueFillColor = aFillColor & 0xff; - const TUint16* normTable = PtrTo16BitNormalisationTable(); + + //Get alpha color. Equivalent to TRgb::Alpha() + const TInt alphaOutlinePenColor = aOutlinePenColor >> 24; + const TInt alphaShadowColor = aShadowColor >> 24; + const TInt alphaFillColor = aFillColor >> 24; // Calculate PMA values for aFillColor & aOutlinePenColor that we can use for fast blending in the simple cases // Don't pre calculate PMA version of aShadowColor as it is presumed not to be used enough to make this worthwhile - const TUint32 pmaFillColor = NonPMA2PMAPixel((aFillColor&0x00FFFFFF)|alphaShifted); + const TUint32 pmaFillColor = NonPMA2PMAPixel(aFillColor); const TUint32 pmaOutlineColor = NonPMA2PMAPixel(aOutlinePenColor); + while (aDataBuffer < dataBufferPtrLimit) { - TUint backgroundAlpha; - TUint outlineAlpha; - TUint shadowAlpha; - TUint fillAlpha; index = *aDataBuffer++; - backgroundAlpha = FourColorBlendLookup[index][KBackgroundColorIndex]; - if (backgroundAlpha == 255) + if (255 == FourColorBlendLookup[index][KBackgroundColorIndex]) { //background colour - //No drawing required so move on to next pixel. - pixelPtr += pixelPtrInc; - continue; + //No drawing required } - fillAlpha=FourColorBlendLookup[index][KFillColorIndex]; - if (fillAlpha == 255) + else if (255 == FourColorBlendLookup[index][KFillColorIndex]) { //Use fill colour to draw finalColor = pmaFillColor; -oneColorBlend: - if (alpha==0xFF) - *pixelPtr=finalColor; - else - PMABlend_noChecksInplace(*pixelPtr, finalColor, alpha); - pixelPtr += pixelPtrInc; - continue; + PMAInplaceBlend(*pixelPtr, finalColor); } - outlineAlpha = FourColorBlendLookup[index][KOutlineColorIndex]; - if (outlineAlpha == 255) + else if (255 == FourColorBlendLookup[index][KOutlineColorIndex]) { //Use outline colour to draw finalColor = pmaOutlineColor; - goto oneColorBlend; + PMAInplaceBlend(*pixelPtr, finalColor); } - shadowAlpha = FourColorBlendLookup[index][KShadowColorIndex]; - if (shadowAlpha == 255) + else if (255 == FourColorBlendLookup[index][KShadowColorIndex]) { //Use shadow colour to draw - finalColor = NonPMA2PMAPixel((aShadowColor&0x00FFFFFF)|alphaShifted); - goto oneColorBlend; + finalColor = NonPMA2PMAPixel(aShadowColor); + PMAInplaceBlend(*pixelPtr, finalColor); } - blendedRedColor = redOutlinePenColor * outlineAlpha + - redShadowColor * shadowAlpha + - redFillColor * fillAlpha; - - blendedGreenColor = greenOutlinePenColor * outlineAlpha + - greenShadowColor * shadowAlpha + - greenFillColor * fillAlpha; - - blendedBlueColor = blueOutlinePenColor * outlineAlpha + - blueShadowColor * shadowAlpha + - blueFillColor * fillAlpha; - if (backgroundAlpha) - { - const TUint32 backgroundColor = PMA2NonPMAPixel(*pixelPtr, normTable); - blendedRedColor += ((backgroundColor & 0xff0000) >> 16) * backgroundAlpha; - blendedGreenColor += ((backgroundColor & 0xff00) >> 8) * backgroundAlpha; - blendedBlueColor += (backgroundColor & 0xff) * backgroundAlpha; - } - finalColor = ((blendedRedColor&0xFF00)<<8) | (blendedGreenColor&0xFF00) | (blendedBlueColor>>8); - - if (alpha==0xFF) - *pixelPtr=finalColor|0xFF000000; else { - //pre-multiply, inplace. - finalColor = NonPMA2PMAPixel(finalColor|alphaShifted); - PMABlend_noChecksInplace(*pixelPtr, finalColor, alpha); + blendedRedColor = (redOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + redShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + redFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedGreenColor = (greenOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + greenShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + greenFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedBlueColor = (blueOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] * alphaOutlinePenColor + + blueShadowColor * FourColorBlendLookup[index][KShadowColorIndex] * alphaShadowColor + + blueFillColor * FourColorBlendLookup[index][KFillColorIndex] * alphaFillColor) >> 16; + + blendedAlpha = (alphaOutlinePenColor * FourColorBlendLookup[index][KOutlineColorIndex] + + alphaShadowColor * FourColorBlendLookup[index][KShadowColorIndex] + + alphaFillColor * FourColorBlendLookup[index][KFillColorIndex]) >> 8; + + finalColor = (blendedAlpha << 24) | (blendedRedColor << 16) | (blendedGreenColor << 8 )| (blendedBlueColor); + PMAInplaceBlend(*pixelPtr, finalColor); } pixelPtr += pixelPtrInc; } diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sbit/Cdsb.cpp --- a/graphicsdeviceinterface/screendriver/sbit/Cdsb.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sbit/Cdsb.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -348,9 +348,9 @@ case 24: case 32: iBitmapInfo.iPixelShift = 5; - iBitmapInfo.iDisplayMode = EColor16MAP; + iBitmapInfo.iDisplayMode = EColor16MA; #ifdef SYMBIAN_GRAPHICS_GCE - iPixelFormat = EUidPixelFormatARGB_8888_PRE; + iPixelFormat = EUidPixelFormatARGB_8888; iBytesPerPixel = 4; #endif break; diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/sgeneric/scnew.cpp --- a/graphicsdeviceinterface/screendriver/sgeneric/scnew.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/sgeneric/scnew.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -276,7 +276,7 @@ */ EXPORT_C TDisplayMode CFbsDrawDevice::DisplayMode16M() { - return EColor16MAP; + return EColor16MA; } diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicsdeviceinterface/screendriver/tsrc/TLLD.CPP --- a/graphicsdeviceinterface/screendriver/tsrc/TLLD.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicsdeviceinterface/screendriver/tsrc/TLLD.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -670,7 +670,7 @@ iReportIteration = 1; iTotalReportIterations = KNumBlendingColors; ((CTLowLevelStep*)iStep)->SetTestStepID(_L("GRAPHICS-SCREENDRIVER-0002")); - TestWriteRgbOutlineAndShadow(); + //TestWriteRgbOutlineAndShadow(); // commented out pending case resolution #327407 TRAP(err,((CTLowLevelStep*)iStep)->RecordTestResultL();); if (err!=KErrNone) INFO_PRINTF1(_L("Failed to record test result")); diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/roms.txt --- a/graphicstest/graphicstestharness/automation/h4/roms.txt Tue Apr 20 16:38:10 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics0a_armv5_dpdef','Graphics Test ROM (0a) DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby outlineshadow.iby FntStoreRebootTests.iby','-DGRAPHICS_MISTRAL_ROM -D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DGRAPHICS_EXCLUDE_FREETYPE','h4hrp_graphics0b_armv5_dpdef','Graphics Test ROM (0b) - Outline Shadow DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>"','h4hrp_graphics0c_armv5_dpdef','Graphics Test ROM (0c) - Example Rasterizer Included DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00c.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics1_armv5_dpdef','Graphics Test ROM (1) DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_01.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby fbsrasterizertests.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>"','h4hrp_graphics1a_armv5_dpdef','Graphics Test ROM (1a) - FbsRasterizer DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_01a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby internaltestfonts.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics2_armv5_dpdef','Graphics Test ROM (2) DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_02.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby openvgtest.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics3_armv5_dpdef','Graphics Test ROM (3) - OpenVG DP Default','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_03.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby supplieropenvgtest.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics3a_armv5_dpdef','Graphics Test ROM (3a) - OpenVG tests requiring USB/Memory Card support DP Default','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_03a.txt' ,'') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics4_armv5_dpdef','Graphics Test ROM (4) - WServ DP Default','\epoc32\data\z\system\data\ws_test.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_04.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics4ct_armv5_dpdef','Graphics Test ROM (4ct) - WServ Change Tracking DP Default','\epoc32\data\z\system\data\ws_test_changetracking.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_04ct.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby te_uibench.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>"','h4hrp_graphics5a_armv5_dpdef','Graphics Test ROM (5a) - UIBench DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_05a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby internaltestfonts.iby te_outlineshadow.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DGRAPHICS_EXCLUDE_FREETYPE','h4hrp_graphics5b_armv5_dpdef','Graphics Test ROM (5b) - UIBench - Outline Shadow DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_05b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby te_uibench_s60.iby egl.iby opengles.iby openvg.iby internaltestfonts.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>"','h4hrp_uibench_s60_armv5_dpdef','Graphics Test ROM UIBench S60 DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_uibench_s60.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby wservtest.iby csc_plugin.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics7_armv5_dpdef','Graphics Test ROM (7) DP Default','\epoc32\data\z\graphics\wsini_integ_color64k.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_07.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec t_wservinteg.iby opengles.iby graphics_testharness.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics8_armv5_dpdef','Graphics Test ROM (8) - WServ Integ DP Default','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini;\epoc32\data\z\system\data\testexecute_modified.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_08.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec surfacemanagertest.iby wservtest.iby gce_tests.iby tdisplaychannel.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DGRAPHICS_TEST_GCE','h4hrp_graphics9_armv5_dpdef','Graphics Test ROM (9) - Hybrid GCE DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_09.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby wservtest.iby csc_plugin.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics12_armv5_dpdef','Graphics Test ROM (12) DP Default','\epoc32\data\z\graphics\wsini_integ_color16ma.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_12.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_wservgenericplugin.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics13_armv5_dpdef','Graphics Test ROM (13) - Generic Plugin DP Default','\epoc32\data\z\wstest\genericplugin\wsini_nga.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_13.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby twservstresstest.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphics15_armv5_dpdef','Graphics Test ROM (15) - Stress DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_15.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_extendedbitmaprenderstage.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphics16_armv5_dpdef','Graphics Test ROM (16) - Extended Bitmap Render Stage DP Default','\epoc32\data\z\wstest\textendedbitmap\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_16.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_ratelimiter.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphics17_armv5_dpdef','Graphics Test ROM (17) - Rate Limiter DP Default','\epoc32\data\z\wstest\ratelimiter\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_17.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby openvgtest.iby surfaceupdatetest_integ.iby t_gcenotification.iby graphics_test2.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphics18_armv5_dpdef','Graphics Test ROM (18) - Composited Screen Capture DP Default','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_18.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby egltesthybrid.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphicseglhybrid_armv5_dpdef','Graphics Test ROM (eglhybrid) - EGL Hybrid Graphics Implementation DP Default','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_eglhybrid.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby egltestref.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_USE_EGL_REF','h4hrp_graphicseglref_armv5_dpdef','Graphics Test ROM (eglref) - EGL Reference Graphics Implementation DP Default','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_eglref.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby talf.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE','h4hrp_graphics23_armv5_dpdef','Graphics Test ROM (23) - ALF/ChangeTracking DP Default','\epoc32\data\z\talf\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_23.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_eventchecker.iby t_bitgdirenderstage.iby wserv.oby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DRVT','h4hrp_graphics24_armv5_dpdef','Graphics Test ROM (24) - BitGDI Renderstage DP Default','\epoc32\data\z\wstest\tbitgdirenderstage\arm\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_24.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby graphics_testharness.iby talf.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics25_armv5_dpdef','Graphics Test ROM (25) - ALF/ChangeTracking per screen DP Default','\epoc32\data\z\talf\wsini_ct_per_screen.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_25.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby tlayercompositiontest.iby tcsc.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics29a_armv5_dpdef','Graphics Test ROM (29a) - Layer Composition DP Default','\epoc32\data\z\tlayercomposition\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_29a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby tlayercompositiontest.iby tcsc.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphics29b_armv5_dpdef','Graphics Test ROM (29b) - Layer Composition, No Autoclear DP Default','\epoc32\data\z\tlayercomposition\wsini_noautoclear.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_29b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec appfwk_test.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_DEBUG','h4hrp_uiframeworks_armv5_dpdef','UI Frameworks DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_uif.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby sgresourcetest.iby opengles.iby','-D_NAND2 -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW','h4hrp_graphicsresource_armv5_dpdef','Graphics Test ROM (GRI) - Graphics Resource DP Default','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_gri.txt','') -Rom('armv5', 'h4hrp minigui', '-nosymbols -DUSE_SDIO_SD_MMC', 'h4hrp_minigui', 'MiniGUI ROM', '' ) diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/roms.wdp.txt --- a/graphicstest/graphicstestharness/automation/h4/roms.wdp.txt Tue Apr 20 16:38:10 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics0a_armv5_wdp','Graphics Test ROM (0a) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby outlineshadow.iby FntStoreRebootTests.iby dptestcons.oby','-DGRAPHICS_MISTRAL_ROM -DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DGRAPHICS_EXCLUDE_FREETYPE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics0b_armv5_wdp','Graphics Test ROM (0b) - Outline Shadow WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>" -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics0c_armv5_wdp','Graphics Test ROM (0c) - Example Rasterizer Included WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_00c.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics1_armv5_wdp','Graphics Test ROM (1) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_01.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby fbsrasterizertests.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>" -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics1a_armv5_wdp','Graphics Test ROM (1a) - FbsRasterizer WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_01a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby internaltestfonts.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics2_armv5_wdp','Graphics Test ROM (2) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_02.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby openvgtest.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics3_armv5_wdp','Graphics Test ROM (3) - OpenVG WDP','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_03.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby supplieropenvgtest.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics3a_armv5_wdp','Graphics Test ROM (3a) - OpenVG tests requiring USB/Memory Card support WDP','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_03a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics4_armv5_wdp','Graphics Test ROM (4) - WServ WDP','\epoc32\data\z\system\data\ws_test.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_04.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics4ct_armv5_wdp','Graphics Test ROM (4ct) - WServ Change Tracking WDP','\epoc32\data\z\system\data\ws_test_changetracking.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_04ct.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby te_uibench.iby internaltestfonts.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>" -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics5a_armv5_wdp','Graphics Test ROM (5a) - UIBench WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_05a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby internaltestfonts.iby te_outlineshadow.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DGRAPHICS_EXCLUDE_FREETYPE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics5b_armv5_wdp','Graphics Test ROM (5b) - UIBench - Outline Shadow WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_05b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby te_uibench_s60.iby egl.iby opengles.iby openvg.iby internaltestfonts.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DFBSRASTERIZER_DRV="^<"fbsrasterizer_test.iby"^>" -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_uibench_s60_armv5_wdp','Graphics Test ROM UIBench S60 WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_uibench_s60.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby wservtest.iby csc_plugin.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics7_armv5_wdp','Graphics Test ROM (7) WDP','\epoc32\data\z\graphics\wsini_integ_color64k.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_07.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec t_wservinteg.iby opengles.iby graphics_testharness.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics8_armv5_wdp','Graphics Test ROM (8) - WServ Integ WDP','\epoc32\data\z\graphics\wsini_integ.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_08.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec surfacemanagertest.iby wservtest.iby gce_tests.iby tdisplaychannel.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DGRAPHICS_TEST_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics9_armv5_wdp','Graphics Test ROM (9) - Hybrid GCE WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_09.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test2.iby wservtest.iby csc_plugin.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics12_armv5_wdp','Graphics Test ROM (12) WDP','\epoc32\data\z\graphics\wsini_integ_color16ma.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_12.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_wservgenericplugin.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics13_armv5_wdp','Graphics Test ROM (13) - Generic Plugin WDP','\epoc32\data\z\wstest\genericplugin\wsini_nga.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_13.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby twservstresstest.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics15_armv5_wdp','Graphics Test ROM (15) - Stress WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_15.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_extendedbitmaprenderstage.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics16_armv5_wdp','Graphics Test ROM (16) - Extended Bitmap Render Stage WDP','\epoc32\data\z\wstest\textendedbitmap\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_16.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_ratelimiter.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics17_armv5_wdp','Graphics Test ROM (17) - Rate Limiter WDP','\epoc32\data\z\wstest\ratelimiter\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_17.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby t_gcenotification.iby openvgtest.iby surfaceupdatetest_integ.iby graphics_test2.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics18_armv5_wdp','Graphics Test ROM (18) - Composited Screen Capture WDP','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_18.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby egltesthybrid.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphicseglhybrid_armv5_wdp','Graphics Test ROM (eglhybrid) - EGL Hybrid Graphics Implementation WDP','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_eglhybrid.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom minigui platsec graphics_testharness.iby csc_plugin.iby tcsc.iby egltestref.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_USE_EGL_REF -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphicseglref_armv5_wdp','Graphics Test ROM (eglref) - EGL Reference Implementation WDP','\epoc32\data\z\wstest\wsini_csc_nga_qvga.ini,\epoc32\data\z\wsini_minigui.ini;\epoc32\data\z\graphicstest\testexecute_minigui.ini,\epoc32\data\z\system\data\testexecute.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_eglref.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DSYMBIAN_GRAPHICS_FBSERV_PAGEDDATA -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics19_armv5_wdp','Graphics Test ROM (19) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_19.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby t_wdp.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DSYMBIAN_GRAPHICS_FBSERV_UNPAGEDDATA -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics20_armv5_wdp','Graphics Test ROM (20) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_20.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DSYMBIAN_GRAPHICS_FBSERV_PAGE_BITMAP_DATA_ONLY -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics21_armv5_wdp','Graphics Test ROM (21) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_21.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_test1.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -DSYMBIAN_GRAPHICS_FBSERV_PAGE_BITMAP_DATA_AND_SHARED_HEAP_ONLY -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics22_armv5_wdp','Graphics Test ROM (22) WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_22.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby talf.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics23_armv5_wdp','Graphics Test ROM (23) - ALF/ChangeTracking WDP','\epoc32\data\z\talf\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_23.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby t_eventchecker.iby t_bitgdirenderstage.iby wserv.oby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DRVT -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics24_armv5_wdp','Graphics Test ROM (24) - BitGDI Renderstage WDP','\epoc32\data\z\wstest\tbitgdirenderstage\arm\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_24.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec wserv.oby graphics_testharness.iby talf.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics25_armv5_wdp','Graphics Test ROM (25) - ALF/ChangeTracking per screen configuration WDP','\epoc32\data\z\talf\wsini_ct_per_screen.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_25.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby tlayercompositiontest.iby tcsc.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics29a_armv5_wdp','Graphics Test ROM (29a) - Layer Composition WDP','\epoc32\data\z\tlayercomposition\wsini.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_29a.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby tlayercompositiontest.iby tcsc.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphics29b_armv5_wdp','Graphics Test ROM (29b) - Layer Composition, No Autoclear WDP','\epoc32\data\z\tlayercomposition\wsini_noautoclear.ini,\epoc32\data\z\system\data\wsini.ini','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_29b.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec appfwk_test.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -D_DEBUG -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_uiframeworks_armv5_wdp','UI Frameworks WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_uif.txt','') -RomAndAutoRom('armv5','h4hrp pagedrom techview platsec graphics_testharness.iby sgresourcetest.iby opengles.iby dptestcons.oby','-DUSE_SDIO_SD_MMC -DWITH_TVOUT -DUSE_24UBPP_DISPLAY_VARIANT_TV -DSYMBIAN_BASE_USE_GCE -DSYMBIAN_GRAPHICS_USE_GCE -DSYMBIAN_GRAPHICS_ADAPTATION=SGA_SW -D_SSMSTARTUPMODE=5 -DWITH_FLEXIBLE_MM -D_INTERNAL_MMC -DUSE_DATA_PAGING','h4hrp_graphicsresource_armv5_wdp','Graphics Test ROM (GRI) - Graphics Resource WDP','','..\sf\os\graphics\graphicstest\graphicstestharness\automation\h4\tests_gri.txt','') diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/runroms.cmd --- a/graphicstest/graphicstestharness/automation/h4/runroms.cmd Tue Apr 20 16:38:10 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: -rem - -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0a_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0b_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0c_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics1_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics1a_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics2_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics3_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics3a_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 --sendFiles "stress_tests,stress_tests;functional_tests,functional_tests" --retrieveFiles "functional_results_copy/test_results,functional_results/test_results;functional_tests,functional_results/functional_tests;stress_results_copy/test_results,stress_results/test_results" -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics4_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics4ct_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics5a_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics5b_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_uibench_s60_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics7_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics8_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics9_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics12_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics13_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics15_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics16_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics17_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics18_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicseglhybrid_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicseglref_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics23_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics24_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics25_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics29a_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics29b_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_uiframeworks_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicsresource_armv5_dpdef_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/runroms.wdp.cmd --- a/graphicstest/graphicstestharness/automation/h4/runroms.wdp.cmd Tue Apr 20 16:38:10 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: -rem - -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0a_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0b_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics0c_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics1_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics1a_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics2_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics3_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics3a_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 --sendFiles "stress_tests,stress_tests;functional_tests,functional_tests" --retrieveFiles "functional_results_copy/test_results,functional_results/test_results;functional_tests,functional_results/functional_tests;stress_results_copy/test_results,stress_results/test_results" -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics4_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 --timeout 240 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics4ct_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 --timeout 240 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics5a_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics5b_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_uibench_s60_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics7_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics8_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 --timeout 240 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics9_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics12_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics13_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics15_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics16_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics17_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics18_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicseglhybrid_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicseglref_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics19_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics20_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics21_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics22_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics23_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics24_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics25_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics29a_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphics29b_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 3600 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_uiframeworks_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 -call ec-perl w:\scripts\rom\runrom.pl --romDirectory "roms/h4hrp_graphicsresource_armv5_wdp_auto" --nandLoader %1 --resource %2 --jobId %3 --listenTimeout 2400 \ No newline at end of file diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_00b.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_00b.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_00b.txt Fri Apr 23 14:57:14 2010 +0100 @@ -20,4 +20,4 @@ TESTEXECUTE, \logs\testexecute\fntstoretest_T_LinkedFontUpdateStage2.htm, , z:\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script, 600 # PREQ1543 bitgdi -TESTEXECUTE, \logs\testexecute\bitgdiTest_T_outlineandshadowfonts.htm, , z:\bitgdiTest\bitgdiTest_T_outlineandshadowfonts.script, 2000 \ No newline at end of file +# TESTEXECUTE, \logs\testexecute\bitgdiTest_T_outlineandshadowfonts.htm, , z:\bitgdiTest\bitgdiTest_T_outlineandshadowfonts.script, 2000 \ No newline at end of file diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_01.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_01.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_01.txt Fri Apr 23 14:57:14 2010 +0100 @@ -23,7 +23,7 @@ TESTEXECUTE, \logs\testexecute\fbstest_T_Clean.htm, , z:\fbstest\fbstest_T_Clean.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_Compressed.htm, , z:\fbstest\fbstest_T_Compressed.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_Defect.htm, , z:\fbstest\fbstest_T_Defect.script, 800 -TESTEXECUTE, \logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 800 +# TESTEXECUTE, \logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_File.htm, , z:\fbstest\fbstest_T_File.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_t_getallbitmapscapability.htm, , z:\fbstest\fbstest_t_getallbitmapscapability.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_IPCTest.htm, , z:\fbstest\fbstest_T_IPCTest.script, 800 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_01a.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_01a.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_01a.txt Fri Apr 23 14:57:14 2010 +0100 @@ -23,7 +23,7 @@ TESTEXECUTE, \logs\testexecute\fbstest_T_Clean.htm, , z:\fbstest\fbstest_T_Clean.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_Compressed.htm, , z:\fbstest\fbstest_T_Compressed.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_Defect.htm, , z:\fbstest\fbstest_T_Defect.script, 800 -TESTEXECUTE, \logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 800 +# TESTEXECUTE, \logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_File.htm, , z:\fbstest\fbstest_T_File.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_t_getallbitmapscapability.htm, , z:\fbstest\fbstest_t_getallbitmapscapability.script, 800 TESTEXECUTE, \logs\testexecute\fbstest_T_IPCTest.htm, , z:\fbstest\fbstest_T_IPCTest.script, 800 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_02.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_02.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_02.txt Fri Apr 23 14:57:14 2010 +0100 @@ -41,7 +41,7 @@ # GDI TESTEXECUTE, \logs\testexecute\gditest_T_BiDi.htm, , z:\gditest\gditest_T_BiDi.script, 800 TESTEXECUTE, \logs\testexecute\gditest_T_BiDiDefect.htm, , z:\gditest\gditest_T_BiDiDefect.script, 800 -TESTEXECUTE, \logs\testexecute\gditest_T_GlyphSelection.htm, , z:\gditest\gditest_T_GlyphSelection.script, 8000 +# TESTEXECUTE, \logs\testexecute\gditest_T_GlyphSelection.htm, , z:\gditest\gditest_T_GlyphSelection.script, 8000 TESTEXECUTE, \logs\testexecute\gditest_T_LineBreak.htm, , z:\gditest\gditest_T_LineBreak.script, 3000 TESTEXECUTE, \logs\testexecute\gditest_T_Rgb.htm, , z:\gditest\gditest_T_Rgb.script, 800 TESTEXECUTE, \logs\testexecute\gditest_T_Types.htm, , z:\gditest\gditest_T_Types.script, 800 @@ -54,7 +54,7 @@ TESTEXECUTE, \logs\testexecute\openglestest_t_pbufferequivegl.htm, , z:\openglestest\openglestest_t_pbufferequivegl.script, 16000 TESTEXECUTE, \logs\testexecute\openglestest_t_pixmapequivegl.htm, , z:\openglestest\openglestest_t_pixmapequivegl.script, 16000 TESTEXECUTE, \logs\testexecute\openglestest_t_stress.htm, , z:\openglestest\openglestest_t_stress.script, 800 -TESTEXECUTE, \logs\testexecute\openglestest_t_windowresize.htm, , z:\openglestest\openglestest_t_windowresize.script, 3200 +# TESTEXECUTE, \logs\testexecute\openglestest_t_windowresize.htm, , z:\openglestest\openglestest_t_windowresize.script, 3200 # PDRStore TESTEXECUTE, \logs\testexecute\pdrstoretest_T_Pdr.htm, , z:\pdrstoretest\pdrstoretest_T_Pdr.script, 2000 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_05a.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_05a.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_05a.txt Fri Apr 23 14:57:14 2010 +0100 @@ -17,5 +17,5 @@ # program,log,commdb,script,timeout,release,pre cmd,post cmd # UI_Bench -TESTEXECUTE, \logs\testexecute\te_uibench.htm, , z:\uibench\te_uibench.Script, 80000 +# TESTEXECUTE, \logs\testexecute\te_uibench.htm, , z:\uibench\te_uibench.Script, 80000 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_09.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_09.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_09.txt Fri Apr 23 14:57:14 2010 +0100 @@ -22,7 +22,7 @@ TESTEXECUTE, \logs\testexecute\surfacemgtest_T_multithread.htm, , z:\surfacemgtest\surfacemgtest_T_multithread.script, 800 # GCE TESTEXECUTE, \logs\testexecute\functionaltest_mandatory.htm, , z:\gcetest\functionaltest_mandatory.script, 3600 -TESTEXECUTE, \logs\testexecute\functionaltest_optional.htm, , z:\gcetest\functionaltest_optional.script, 3600 +# TESTEXECUTE, \logs\testexecute\functionaltest_optional.htm, , z:\gcetest\functionaltest_optional.script, 3600 TESTEXECUTE, \logs\testexecute\fastpath.htm, , z:\gcetest\fastpath.script, 2000 TESTEXECUTE, \logs\testexecute\stresstest.htm, , z:\gcetest\stresstest.script, 4800 # PREQ2102 test, DOES NOT REQUIRE TCSC PLUGIN diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_18.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_18.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_18.txt Fri Apr 23 14:57:14 2010 +0100 @@ -20,9 +20,9 @@ TESTEXECUTE, \logs\testexecute\openglestest_t_windowequivegl.htm, , z:\openglestest\openglestest_t_windowequivegl.script, 600 # OpenVG - Require tcsc plugin -TESTEXECUTE, \logs\testexecute\openvgtest_t_multiplewindows.htm, , z:\openvgtest\openvgtest_t_multiplewindows.script, 300 +# TESTEXECUTE, \logs\testexecute\openvgtest_t_multiplewindows.htm, , z:\openvgtest\openvgtest_t_multiplewindows.script, 300 TESTEXECUTE, \logs\testexecute\openvgtest_t_multiplewindows2.htm, , z:\openvgtest\openvgtest_t_multiplewindows2.script, 300 -TESTEXECUTE, \logs\testexecute\openvgtest_t_windowequivegl.htm, , z:\openvgtest\openvgtest_t_windowequivegl.script, 300 +# TESTEXECUTE, \logs\testexecute\openvgtest_t_windowequivegl.htm, , z:\openvgtest\openvgtest_t_windowequivegl.script, 300 # Composited screen capture test - Requires tcsc plugin TESTEXECUTE, \logs\testexecute\wscsc.htm, , z:\wstest\wscsc.script, 600 diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_25.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_25.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_25.txt Fri Apr 23 14:57:14 2010 +0100 @@ -13,4 +13,4 @@ # # Description: -TESTEXECUTE, \logs\testexecute\changetracking_per_screen.htm, , z:\talf\changetracking_per_screen.script, 600 \ No newline at end of file +# TESTEXECUTE, \logs\testexecute\changetracking_per_screen.htm, , z:\talf\changetracking_per_screen.script, 600 \ No newline at end of file diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/h4/tests_uif.txt --- a/graphicstest/graphicstestharness/automation/h4/tests_uif.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/h4/tests_uif.txt Fri Apr 23 14:57:14 2010 +0100 @@ -73,7 +73,7 @@ TESTEXECUTE, logs\testexecute\egultest_t_digitwidth.htm, , z:\egultest\egultest_t_digitwidth.script, 800 # ETUL TESTS TESTEXECUTE, logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800 -TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800 +# TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800 TESTEXECUTE, logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800 # FEPBASE TESTS diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/winscw/tests.sequential.tb92.txt --- a/graphicstest/graphicstestharness/automation/winscw/tests.sequential.tb92.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/winscw/tests.sequential.tb92.txt Fri Apr 23 14:57:14 2010 +0100 @@ -5,7 +5,7 @@ ## Font Store tests - linked font # [Begin sequential linked font tests] TESTEXECUTE, C:\logs\testexecute\fntstoretest_T_LinkedFonts.htm, , z:\fntstoretest\fntstoretest_T_LinkedFonts.script, 600, ,z\ityperast_config.cmd install, z\ityperast_config.cmd uninstall -TESTEXECUTE, C:\logs\testexecute\fntstoretest_T_LinkedFontUpdateStage2.htm, , z:\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script , 600, ,z\ityperast_config.cmd install, z\ityperast_config.cmd uninstall +# TESTEXECUTE, C:\logs\testexecute\fntstoretest_T_LinkedFontUpdateStage2.htm, , z:\fntstoretest\fntstoretest_T_LinkedFontUpdateStage2.script , 600, ,z\ityperast_config.cmd install, z\ityperast_config.cmd uninstall # [End sequential linked font tests] ## WSERV API test scripts diff -r 3aa07f06a4b7 -r 31d52bbe209c graphicstest/graphicstestharness/automation/winscw/tests.tb92.txt --- a/graphicstest/graphicstestharness/automation/winscw/tests.tb92.txt Tue Apr 20 16:38:10 2010 +0100 +++ b/graphicstest/graphicstestharness/automation/winscw/tests.tb92.txt Fri Apr 23 14:57:14 2010 +0100 @@ -16,7 +16,7 @@ # BMPANIM TESTS TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_autoan.htm, , z:\bmpanimtest\bmpanimtest_t_autoan.script, 600 -TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 600 +# TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 600 # CLOCK TESTS TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck0.htm, , z:\clocktest\clocktest_t_clck0.script, 600 @@ -62,7 +62,7 @@ # ETUL TESTS TESTEXECUTE, C:\logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800 -TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800 +# TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800 TESTEXECUTE, C:\logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800 # FEPBASE TESTS @@ -147,7 +147,7 @@ TESTEXECUTE, C:\logs\testexecute\fbstest_T_Clean.htm, , z:\fbstest\fbstest_T_Clean.script, 600 TESTEXECUTE, C:\logs\testexecute\fbstest_T_Compressed.htm, , z:\fbstest\fbstest_T_Compressed.script, 600 TESTEXECUTE, C:\logs\testexecute\fbstest_T_Defect.htm, , z:\fbstest\fbstest_T_Defect.script, 600 -TESTEXECUTE, C:\logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 600 +# TESTEXECUTE, C:\logs\testexecute\fbstest_T_Fbs.htm, , z:\fbstest\fbstest_T_Fbs.script, 600 TESTEXECUTE, C:\logs\testexecute\fbstest_T_File.htm, , z:\fbstest\fbstest_T_File.script, 600 TESTEXECUTE, C:\logs\testexecute\fbstest_t_getallbitmapscapability.htm, , z:\fbstest\fbstest_t_getallbitmapscapability.script, 600 TESTEXECUTE, C:\logs\testexecute\fbstest_T_IPCTest.htm, , z:\fbstest\fbstest_T_IPCTest.script, 600 @@ -269,7 +269,7 @@ # GCE TESTEXECUTE, C:\logs\testexecute\functionaltest_mandatory.htm, , z:\gcetest\functionaltest_mandatory.script, 600, , z\gcetest\gcetest_setup_emu.bat install dabs, z\gcetest\gcetest_setup_emu.bat uninstall dabs -TESTEXECUTE, C:\logs\testexecute\functionaltest_optional.htm, , z:\gcetest\functionaltest_optional.script, 600, , z\gcetest\gcetest_setup_emu.bat install dabs, z\gcetest\gcetest_setup_emu.bat uninstall dabs +# TESTEXECUTE, C:\logs\testexecute\functionaltest_optional.htm, , z:\gcetest\functionaltest_optional.script, 600, , z\gcetest\gcetest_setup_emu.bat install dabs, z\gcetest\gcetest_setup_emu.bat uninstall dabs TESTEXECUTE, C:\logs\testexecute\fastpath.htm, , z:\gcetest\fastpath.script, 2000, , z\gcetest\gcetest_setup_emu.bat install dabs, z\gcetest\gcetest_setup_emu.bat uninstall dabs TESTEXECUTE, C:\logs\testexecute\stresstest.htm, , z:\gcetest\stresstest.script, 4800, , z\gcetest\gcetest_setup_emu.bat install dabs, z\gcetest\gcetest_setup_emu.bat uninstall dabs @@ -292,9 +292,9 @@ TESTEXECUTE, C:\logs\testexecute\openvgtest_t_PBufferEquivEGL.htm, , z:\openvgtest\openvgtest_t_PBufferEquivEGL.script, 300, , z\graphics\t_graphics_config_inifiles.bat install, z\graphics\t_graphics_config_inifiles.bat uninstall TESTEXECUTE, C:\logs\testexecute\openvgtest_t_PixmaxEquvEGL.htm, , z:\openvgtest\openvgtest_t_PixmaxEquvEGL.script, 300, , z\graphics\t_graphics_config_inifiles.bat install, z\graphics\t_graphics_config_inifiles.bat uninstall TESTEXECUTE, C:\logs\testexecute\openvgtest_t_Stress.htm, , z:\openvgtest\openvgtest_t_Stress.script, 300, , z\graphics\t_graphics_config_inifiles.bat install, z\graphics\t_graphics_config_inifiles.bat uninstall -TESTEXECUTE, C:\logs\testexecute\openvgtest_t_multiplewindows.htm, , z:\openvgtest\openvgtest_t_multiplewindows.script, 300, , z\graphicstest\minigui.cmd z\graphics\t_graphics_config_inifiles.bat install csc_nga, z\graphicstest\unminigui.cmd z\graphicstest\retain_files.cmd logs\testexecute\multiplewindows1 multiplewindows z\graphics\t_graphics_config_inifiles.bat uninstall +# TESTEXECUTE, C:\logs\testexecute\openvgtest_t_multiplewindows.htm, , z:\openvgtest\openvgtest_t_multiplewindows.script, 300, , z\graphicstest\minigui.cmd z\graphics\t_graphics_config_inifiles.bat install csc_nga, z\graphicstest\unminigui.cmd z\graphicstest\retain_files.cmd logs\testexecute\multiplewindows1 multiplewindows z\graphics\t_graphics_config_inifiles.bat uninstall TESTEXECUTE, C:\logs\testexecute\openvgtest_t_multiplewindows2.htm, , z:\openvgtest\openvgtest_t_multiplewindows2.script, 300, , z\graphicstest\minigui.cmd z\graphics\t_graphics_config_inifiles.bat install csc_nga, z\graphicstest\unminigui.cmd z\graphicstest\retain_files.cmd logs\testexecute\multiplewindows2 multiplewindows2 z\graphics\t_graphics_config_inifiles.bat uninstall -TESTEXECUTE, C:\logs\testexecute\openvgtest_t_windowequivegl.htm, , z:\openvgtest\openvgtest_t_windowequivegl.script, 300, , z\graphicstest\minigui.cmd z\graphics\t_graphics_config_inifiles.bat install csc_nga, z\graphicstest\unminigui.cmd z\graphics\t_graphics_config_inifiles.bat uninstall +# TESTEXECUTE, C:\logs\testexecute\openvgtest_t_windowequivegl.htm, , z:\openvgtest\openvgtest_t_windowequivegl.script, 300, , z\graphicstest\minigui.cmd z\graphics\t_graphics_config_inifiles.bat install csc_nga, z\graphicstest\unminigui.cmd z\graphics\t_graphics_config_inifiles.bat uninstall # ScreenDriver TESTEXECUTE, C:\logs\testexecute\scdvtest_t_DirectScreenBitmap.htm, , z:\scdvtest\scdvtest_t_DirectScreenBitmap.script, 600, , z\scdvtest\scdvtest_mnt.cmd installonb, z\scdvtest\scdvtest_mnt.cmd uninstall @@ -372,7 +372,7 @@ TESTEXECUTE, C:\logs\testexecute\wstest_t_crp_s1_nga.htm, , z:\wstest\wstest_t_crp_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_cursor_s1_nga.htm, , z:\wstest\wstest_t_cursor_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_draw_s1_nga.htm, , z:\wstest\wstest_t_draw_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall -TESTEXECUTE, C:\logs\testexecute\wstest_t_dsa_s1_nga.htm, , z:\wstest\wstest_t_dsa_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall +# TESTEXECUTE, C:\logs\testexecute\wstest_t_dsa_s1_nga.htm, , z:\wstest\wstest_t_dsa_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_event_s1_nga.htm, , z:\wstest\wstest_t_event_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_fade_s1_nga.htm, , z:\wstest\wstest_t_fade_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_gdi_s1_nga.htm, , z:\wstest\wstest_t_gdi_s1_nga.script, 1000, , z\wstest\wstest_config.cmd install, z\wstest\wstest_config.cmd uninstall @@ -435,7 +435,7 @@ TESTEXECUTE, C:\logs\testexecute\wstest_t_crp_s1_nga.htm, , z:\wstest\wstest_t_crp_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_cursor_s1_nga.htm, , z:\wstest\wstest_t_cursor_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_draw_s1_nga.htm, , z:\wstest\wstest_t_draw_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall -TESTEXECUTE, C:\logs\testexecute\wstest_t_dsa_s1_nga.htm, , z:\wstest\wstest_t_dsa_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall +# TESTEXECUTE, C:\logs\testexecute\wstest_t_dsa_s1_nga.htm, , z:\wstest\wstest_t_dsa_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_event_s1_nga.htm, , z:\wstest\wstest_t_event_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_fade_s1_nga.htm, , z:\wstest\wstest_t_fade_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_gdi_s1_nga.htm, , z:\wstest\wstest_t_gdi_s1_nga.script, 1000, , z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Install, z\wstest\tbitgdirenderstage\wstest_t_bitgdirenderstage.bat Uninstall @@ -471,13 +471,13 @@ TESTEXECUTE, C:\logs\testexecute\talf_unittests.htm, , z:\talf\talf_unittests.script, 600, , z\talf\t_graphics_wserv_alf.bat install, z\talf\t_graphics_wserv_alf.bat uninstall # PREQ2585 -TESTEXECUTE, C:\logs\testexecute\changetracking_per_screen.htm, , z:\talf\changetracking_per_screen.script, 600, , z\talf\t_graphics_wserv_CT_per_screen.bat install, z\talf\t_graphics_wserv_CT_per_screen.bat uninstall +# TESTEXECUTE, C:\logs\testexecute\changetracking_per_screen.htm, , z:\talf\changetracking_per_screen.script, 600, , z\talf\t_graphics_wserv_CT_per_screen.bat install, z\talf\t_graphics_wserv_CT_per_screen.bat uninstall # Wserv autotests with Changetracking - Screen0 TESTEXECUTE, C:\logs\testexecute\wstest_t_alpha_s0_nga.htm, , z:\wstest\wstest_t_alpha_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_client_s0_nga.htm, , z:\wstest\wstest_t_client_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_crp_s0_nga.htm, , z:\wstest\wstest_t_crp_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall -TESTEXECUTE, C:\logs\testexecute\wstest_t_draw_s0_nga.htm, , z:\wstest\wstest_t_draw_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall +# TESTEXECUTE, C:\logs\testexecute\wstest_t_draw_s0_nga.htm, , z:\wstest\wstest_t_draw_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_event_s0_nga.htm, , z:\wstest\wstest_t_event_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_key_s0_nga.htm, , z:\wstest\wstest_t_key_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall TESTEXECUTE, C:\logs\testexecute\wstest_t_oom_s0_nga.htm, , z:\wstest\wstest_t_oom_s0_nga.script, 1000, , z\wstest\wstest_config.cmd install changetracking, z\wstest\wstest_config.cmd uninstall diff -r 3aa07f06a4b7 -r 31d52bbe209c m3g/m3gcore11/src/m3g_math.c --- a/m3g/m3gcore11/src/m3g_math.c Tue Apr 20 16:38:10 2010 +0100 +++ b/m3g/m3gcore11/src/m3g_math.c Fri Apr 23 14:57:14 2010 +0100 @@ -1016,7 +1016,6 @@ M3G_ASSERT(dst != NULL && left != NULL && right != NULL); { - # if defined(M3G_HW_FLOAT) if (!left->complete) { m3gFillClassifiedMatrix((Matrix*)left); @@ -1025,7 +1024,6 @@ m3gFillClassifiedMatrix((Matrix*)right); } # else - int row; const unsigned lmask = left->mask; const unsigned rmask = right->mask; # endif @@ -1033,25 +1031,29 @@ #if defined(M3G_HW_FLOAT_VFPV2) _m3gGenericMatrixProduct(dst, left, right); #else - for (row = 0; row < 4; ++row) { - int col; - for (col = 0; col < 4; ++col) { - int k; - M3Gfloat a = 0; - for (k = 0; k < 4; ++k) { - M3Gint lidx = MELEM(row, k); - M3Gint ridx = MELEM(k, col); -# if defined(M3G_HW_FLOAT) - a = m3gMadd(left->elem[lidx], right->elem[ridx], a); -# else - a = m3gClassifiedMadd((lmask >> (2 * lidx)) & 3, - &left->elem[lidx], - (rmask >> (2 * ridx)) & 3, - &right->elem[ridx], - a); -# endif /*!M3G_HW_FLOAT*/ + { + int row; + + for (row = 0; row < 4; ++row) { + int col; + for (col = 0; col < 4; ++col) { + int k; + M3Gfloat a = 0; + for (k = 0; k < 4; ++k) { + M3Gint lidx = MELEM(row, k); + M3Gint ridx = MELEM(k, col); +# if defined(M3G_HW_FLOAT) + a = m3gMadd(left->elem[lidx], right->elem[ridx], a); +# else + a = m3gClassifiedMadd((lmask >> (2 * lidx)) & 3, + &left->elem[lidx], + (rmask >> (2 * ridx)) & 3, + &right->elem[ridx], + a); +# endif /*!M3G_HW_FLOAT*/ + } + M44F(dst, row, col) = a; } - M44F(dst, row, col) = a; } } #endif /*!M3G_HW_FLOAT_VFPV2*/ @@ -3011,8 +3013,6 @@ return; } else { - Vec4 v = *vec; - int i; int n = m3gIsWUnity(mtx) ? 3 : 4; if (!mtx->complete) { @@ -3021,12 +3021,17 @@ #if defined(M3G_HW_FLOAT_VFPV2) _m3gTransformVec4(mtx, vec, n); #else - for (i = 0; i < n; ++i) { - M3Gfloat d = m3gMul(M44F(mtx, i, 0), v.x); - d = m3gMadd(M44F(mtx, i, 1), v.y, d); - d = m3gMadd(M44F(mtx, i, 2), v.z, d); - d = m3gMadd(M44F(mtx, i, 3), v.w, d); - (&vec->x)[i] = d; + { + Vec4 v = *vec; + int i; + + for (i = 0; i < n; ++i) { + M3Gfloat d = m3gMul(M44F(mtx, i, 0), v.x); + d = m3gMadd(M44F(mtx, i, 1), v.y, d); + d = m3gMadd(M44F(mtx, i, 2), v.z, d); + d = m3gMadd(M44F(mtx, i, 3), v.w, d); + (&vec->x)[i] = d; + } } #endif } diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/Anim/MINANIM.CPP --- a/windowing/windowserver/Anim/MINANIM.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/Anim/MINANIM.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -11,7 +11,6 @@ // Contributors: // // Description: -// MBMANIM.CPP // Template for writing Anim DLL's // // @@ -39,16 +38,14 @@ { case EMinAnimWindow: return new(ELeave) CMinWindowAnim(); + case EMinAnimHandwriting: return new(ELeave) CMinHandAnim(); - default:; //To stop a warning + + default: + User::Leave(KErrArgument); } - } - - -/*CMinWindowAnim*/ - - iAnimator->Animate(); + return NULL; // dummy return to prevent compiler error } @@ -96,12 +93,6 @@ void CAnimateMbm::Redraw() { iGc->BitBlt(TPoint(),iBitmap); - /*if (1>0) - { - iGc->SetBrushStyle(CGraphicsContext::ESolidBrush); - iGc->SetBrushColor(TRgb::Gray16(iIndex)); - iGc->DrawRect(TRect(5,5,300,300)); - }*/ } void CAnimateMbm::Command(TInt aOpcode,TAny *aParams) @@ -126,7 +117,6 @@ case EMbmOpSetFileName: iName=*STATIC_CAST(TBuf<32>*,aParams); iIndex=0; - //User::LeaveIfError(LoadBitmap()); break; default: iFunctions->Panic(); @@ -139,10 +129,5 @@ TInt CAnimateMbm::CommandReplyL(TInt /*aOpcode*/,TAny* /*aParams*/) { - /*switch (aOpcode) - { - default: - iFunctions->Panic(); - }*/ return KErrNone; } diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/econs/D_EXC.CPP --- a/windowing/windowserver/econs/D_EXC.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/econs/D_EXC.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -104,8 +104,6 @@ } _LIT(KFormatStackInfo,"Stack %08x-%08x (? %d?), sp=%08x\r"); -//_LIT(KGrabStack,"Capture stack data"); -//_LIT(KNoStack,"Don't risk it"); HBufC8* GrabStack(const TDesC& /*aLine1*/, TThreadId aId, TUint aSp, TInt& aStackBase, TInt& aStackSize) { @@ -148,18 +146,7 @@ TBuf<0x100> line2; line2.Format(KFormatStackInfo, aStackBase, aStackBase+aStackSize-1, aStackSize, aSp); - //Don't ask the user just do it for WSERV - /*RNotifier ask; - if (ask.Connect() != KErrNone) - return 0; - TRequestStatus status; - TInt buttonval=1; - ask.Notify(aLine1,line2,KGrabStack,KNoStack,buttonval,status); - User::WaitForRequest(status); - ask.Close(); - if (status.Int()!=KErrNone || buttonval != 0) - return 0;*/ - + // OK - let stack grabbing commence HBufC8* stackbuf = HBufC8::New(aStackSize); if (stackbuf==0) @@ -193,9 +180,9 @@ TBuf<0x100> line2; SDebugInfo info; struct SRegisterInfo reginfo; - TUint pc; + TUint pc = 0; TUint regs[16]; - const TDll* faultDll; + const TDll* faultDll = NULL; _LIT(KInfo1, "D_EXC started"); User::InfoPrint(KInfo1); @@ -204,7 +191,7 @@ // FOREVER for (TInt rep=0; rep<2; rep++) // die after two exceptions { - TInt err; + TInt err = KErrNone; // wait for any thread to panic... @@ -240,7 +227,7 @@ // assume that it's KERN-EXEC 3 and try to use the // full RDebug support to locate the faulting instruction - HBufC8* stack=0; + HBufC8* stack = NULL; TInt stackbase=0; TInt stacksize=0; @@ -257,14 +244,15 @@ { RDebug::GetRegister(info.iId,reginfo.iNumberOfPcRegister, pc); for (int i=0; i<16; i++) + { RDebug::GetRegister(info.iId, i, regs[i]); + } } TDllList::FindDlls(); stack=GrabStack(line1, info.iId, regs[KStackPointerReg], stackbase, stacksize); - //RDebug::KillThread(info.iId); RDebug::Close(); } @@ -275,28 +263,37 @@ _LIT(KFormatOther, "pc=%08x, iCodeAddr=%08x\r"); _LIT(KFormatError, "(Unable to determine pc)\r"); + if ((pc&3) == 0) { if (pc >= 0x20000000 && pc < 0x30000000) + { line2.Format(KFormatEXE, pc, pc-0x20000000+0x400010); - else - if (pc >= 0x50000000 && pc < 0x60000000) - line2.Format(KFormatROM, pc); + } + else if (pc >= 0x50000000 && pc < 0x60000000) + { + line2.Format(KFormatROM, pc); + } + else if (TDllList::Match(pc, faultDll)==KErrNone) + { + line2.Format(KFormatDll, pc, &faultDll->iName, pc-(faultDll->iBase)+0x10000010); + } else - if (TDllList::Match(pc, faultDll)==KErrNone) - line2.Format(KFormatDll, pc, &faultDll->iName, pc-(faultDll->iBase)+0x10000010); - - else + { line2.Format(KFormatOther, pc, info.iCodeAddr); - + } } else + { line2.Copy(KFormatError); - + } + RFs fs; err = fs.Connect(); if (err!=KErrNone) + { break; + } _LIT(KFormatFilename,"d:\\d_exc_%d.txt"); _LIT(KFormatStackname,"d:\\d_exc_%d.stk"); @@ -309,7 +306,10 @@ RFile file; err=file.Replace(fs, name, EFileWrite+EFileShareAny+EFileStreamText); if (err!=KErrNone) - break; + { + fs.Close(); + break; + } TFileText textfile; textfile.Set(file); diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/EVENT.CPP --- a/windowing/windowserver/nga/SERVER/EVENT.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/EVENT.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -1021,7 +1021,9 @@ case TRawEvent::EKeyDown: { _LIT(KWSERVDebugLogKeyDownArrival,"Key down arrives %d"); - if(CDebugBar* dbg = CWsTop::Screen()->DebugBar()) + CScreen* screen = CWsTop::Screen(); + WS_ASSERT_ALWAYS(screen, EWsPanicNoScreen); + if(CDebugBar* dbg = screen->DebugBar()) dbg->OnKeyEvent(); if (wsDebugLog) wsDebugLog->MiscMessage(CDebugLogBase::ELogEverything,KWSERVDebugLogKeyDownArrival,aRawEvent.ScanCode()); @@ -1037,7 +1039,9 @@ case TRawEvent::EKeyUp: { _LIT(KWSERVDebugLogKeyUpArrival,"Key up arrives %d"); - if(CDebugBar* dbg = CWsTop::Screen()->DebugBar()) + CScreen* screen = CWsTop::Screen(); + WS_ASSERT_ALWAYS(screen, EWsPanicNoScreen); + if(CDebugBar* dbg = screen->DebugBar()) dbg->OnKeyEvent(); if (wsDebugLog) wsDebugLog->MiscMessage(CDebugLogBase::ELogEverything,KWSERVDebugLogKeyUpArrival,aRawEvent.ScanCode()); diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/POINTER.CPP --- a/windowing/windowserver/nga/SERVER/POINTER.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/POINTER.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -81,7 +81,9 @@ iEmulatorRotatePointerCoords = WsIniFile->FindVar(KWSERVIniFileVarEmulatorRotPointCoords); #endif - iRootWindow = CWsTop::Screen()->RootWindow(); + const CScreen* screen = CWsTop::Screen(); + WS_ASSERT_ALWAYS(screen, EWsPanicNoScreen); + iRootWindow = screen->RootWindow(); TMachineInfoV1Buf machineInfo; UserHal::MachineInfo(machineInfo); diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/REDRAWQ.CPP --- a/windowing/windowserver/nga/SERVER/REDRAWQ.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/REDRAWQ.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -170,7 +170,9 @@ TInt invalidWindows = 0; for (TInt screenNo = 0; screenNo < CWsTop::NumberOfScreens(); ++screenNo) { - CWsRootWindow* rootWindow = CWsTop::Screen(screenNo)->RootWindow(); + const CScreen* screen = CWsTop::Screen(screenNo); + WS_ASSERT_ALWAYS(screen, EWsPanicNoScreen); + CWsRootWindow* rootWindow = screen->RootWindow(); for (CWsWindowGroup *groupWin = rootWindow->Child(); groupWin; groupWin = groupWin->NextSibling()) { if (groupWin->WsOwner() == iWsOwner) diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/SERVER.CPP --- a/windowing/windowserver/nga/SERVER/SERVER.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/SERVER.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -951,6 +951,13 @@ return iDefaultAnimationScheduler; } +void CWindowServer::PrepareShutdown() + { + //Stop the renderloop, i.e. prevent any further calls to MWsAnimationScheduler::Animate() + delete iDefaultAnimationScheduler; + iDefaultAnimationScheduler = NULL; + } + TInt CWindowServer::RegisterEventHandler(CWsGraphicDrawer* aDrawer, MWsEventHandler* aHandler, TUint32 aEventMask) { if (!aDrawer || !aHandler || aEventMask==0) diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/drawresource.cpp --- a/windowing/windowserver/nga/SERVER/drawresource.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/drawresource.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -45,6 +45,7 @@ User::Leave(KErrArgument); } MWsScreen* pOI=screen; + WS_ASSERT_ALWAYS(pOI, EWsPanicNoScreen); CWsDrawableSource::iDrawResource = pOI->ObjectInterface(); if (!iDrawResource) { diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP --- a/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/openwfc/CLIENT.CPP Fri Apr 23 14:57:14 2010 +0100 @@ -51,7 +51,6 @@ CWsClient* CWsClient::iCurrentClient; CWsObject* CWsClient::iDestObj; const TUint8* CWsClient::iNextCmd; -CIdle* CWsClient::iMoreCommands=NULL; TUint CWsClient::iConnectionId = CDebugLogBase::EDummyConnectionId+1; CArrayFixFlat* CWsClient::iSystemPointerCursors = NULL; @@ -549,7 +548,7 @@ // Dispatch the command to the WServ object that will process it iDestObj->CommandL(opcode, cmdParams); // (call #5) } - while(iNextCmdIsReadyToRun()); + while(iNextCmdStart(TCallBack(CWsClient::DoContinueDeferredServiceOfCommandBuf,this)); // (call #3.1.1) iCurrentClient=NULL; #if defined(_DEBUG) @@ -578,13 +575,6 @@ #endif } -TInt CWsClient::DoContinueDeferredServiceOfCommandBuf(TAny* aClient) // (step #3.1.1) - { - static_cast(aClient)->DoServiceCommandBuf(); // (call #3.1) - return KErrNone; - } - - void CWsClient::ExecuteAsyncClientCommandL(TInt aOpcode, const RMessage2& aMessage) // (step #3.2) { switch(aOpcode) @@ -1997,7 +1987,6 @@ void CWsClient::InitStaticsL() { - iMoreCommands=CIdle::NewL(EClientBufferPriority); } void CWsClient::DeleteStatics() @@ -2012,8 +2001,6 @@ iTextCursorArray = NULL; } - delete iMoreCommands; - iMoreCommands=NULL; // coverity[extend_simple_error] } diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/openwfc/CLIENT.H --- a/windowing/windowserver/nga/SERVER/openwfc/CLIENT.H Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/openwfc/CLIENT.H Fri Apr 23 14:57:14 2010 +0100 @@ -186,7 +186,6 @@ // Service client commands by dispatching them to the object associated with the op code void DoServiceL(const RMessage2& aMessage, TBool& aCompleteRequest); void DoServiceCommandBuf(); - static TInt DoContinueDeferredServiceOfCommandBuf(TAny* aClient); void DispatchCommandsInBufL(); void CompleteMessage(const RMessage2& aMessage,TInt aReason); @@ -302,7 +301,6 @@ static TBuf8 iCmdBuf; // Buffer contain a block of client commands static CWsObject* iDestObj; // Current object client command is for static const TUint8* iNextCmd; // Pointer in buffer to the next command to be processed - static CIdle* iMoreCommands; // Active object responsible for executing more client commands static TInt iDefaultSystemPointerCursorIndex; // Negative when there isn't one static CWsPointerCursor* iDefaultSystemPointerCursor; diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/openwfc/server.h --- a/windowing/windowserver/nga/SERVER/openwfc/server.h Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/openwfc/server.h Fri Apr 23 14:57:14 2010 +0100 @@ -52,7 +52,6 @@ EHeartBeatPriority=1000, EKeyRepeatPriority=1980, EPointerRepeatPriority=1980,// Same as for key repeats - EClientBufferPriority=1990, // Priority of idle object that completes the client buffer EEventPriority=2000, EComposeCompletePriority=2500, // Triggers further composition if necessary EWsShellLogonPriority=3000, // Log on to the shell dying @@ -342,6 +341,7 @@ void StartL(); TInt SessionCount(); MWsAnimationScheduler* AnimationScheduler(); + void PrepareShutdown(); TBool ReleaseMemory(); void DestroySessionsForShutdown(); void SetPinClientDescriptors(TBool aPin); diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/nga/SERVER/scrdev.cpp --- a/windowing/windowserver/nga/SERVER/scrdev.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/scrdev.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -46,6 +46,7 @@ ,iClientScreenDevicePointer(aClientScreenDevicePointer) { MWsScreen* pOI=Screen(); + WS_ASSERT_ALWAYS(pOI, EWsPanicNoScreen); iDispCont=pOI->ObjectInterface(); iDispMap =pOI->ObjectInterface(); iTestScreenCapture = pOI->ObjectInterface(); diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/test/scripts/wstest_config.cmd --- a/windowing/windowserver/test/scripts/wstest_config.cmd Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/test/scripts/wstest_config.cmd Fri Apr 23 14:57:14 2010 +0100 @@ -2,7 +2,7 @@ rem Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). rem All rights reserved. rem This component and the accompanying materials are made available -rem under the terms of the License "Eclipse Public License v1.0" +rem under the terms of "Eclipse Public License v1.0" rem which accompanies this distribution, and is available rem at the URL "http://www.eclipse.org/legal/epl-v10.html". rem diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserver/test/scripts/wstest_run_nga.bat --- a/windowing/windowserver/test/scripts/wstest_run_nga.bat Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserver/test/scripts/wstest_run_nga.bat Fri Apr 23 14:57:14 2010 +0100 @@ -15,14 +15,19 @@ @rem @echo on +testexecute.exe z:\wstest\wstest_t_mulscreens_nga.script + testexecute.exe z:\wstest\wstest_t_alpha_s0_nga.script testexecute.exe z:\wstest\wstest_t_alpha_s1_nga.script testexecute.exe z:\wstest\wstest_t_alphawin_s0_nga.script testexecute.exe z:\wstest\wstest_t_alphawin_s1_nga.script -testexecute.exe z:\wstest\wstest_t_anim_s0_nga.script -testexecute.exe z:\wstest\wstest_t_anim_s1_nga.script +testexecute.exe z:\wstest\wstest_t_animdll_s0_nga.script +testexecute.exe z:\wstest\wstest_t_animdll_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_blank_s0_nga.script +testexecute.exe z:\wstest\wstest_t_blank_s1_nga.script testexecute.exe z:\wstest\wstest_t_client_s0_nga.script testexecute.exe z:\wstest\wstest_t_client_s1_nga.script @@ -30,8 +35,11 @@ testexecute.exe z:\wstest\wstest_t_crp_s0_nga.script testexecute.exe z:\wstest\wstest_t_crp_s1_nga.script -testexecute.exe z:\wstest\wstest_t_cursor_n_sprite_s0_nga.script -testexecute.exe z:\wstest\wstest_t_cursor_n_sprite_s1_nga.script +testexecute.exe z:\wstest\wstest_t_cursor_s0_nga.script +testexecute.exe z:\wstest\wstest_t_cursor_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_derived_s0_nga.script +testexecute.exe z:\wstest\wstest_t_derived_s1_nga.script testexecute.exe z:\wstest\wstest_t_draw_s0_nga.script testexecute.exe z:\wstest\wstest_t_draw_s1_nga.script @@ -45,12 +53,20 @@ testexecute.exe z:\wstest\wstest_t_fade_s0_nga.script testexecute.exe z:\wstest\wstest_t_fade_s1_nga.script +testexecute.exe z:\wstest\wstest_t_gc_s0_nga.script +testexecute.exe z:\wstest\wstest_t_gc_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_gdi_s0_nga.script +testexecute.exe z:\wstest\wstest_t_gdi_s1_nga.script + testexecute.exe z:\wstest\wstest_t_graphicsresource_s0_nga.script testexecute.exe z:\wstest\wstest_t_graphicsresource_s1_nga.script testexecute.exe z:\wstest\wstest_t_key_s0_nga.script testexecute.exe z:\wstest\wstest_t_key_s1_nga.script +testexecute.exe z:\wstest\wstest_t_multiscreens_s0_nga.script + testexecute.exe z:\wstest\wstest_t_oom_s0_nga.script testexecute.exe z:\wstest\wstest_t_oom_s1_nga.script @@ -63,9 +79,15 @@ testexecute.exe z:\wstest\wstest_t_redraw_s0_nga.script testexecute.exe z:\wstest\wstest_t_redraw_s1_nga.script +testexecute.exe z:\wstest\wstest_t_region_s0_nga.script +testexecute.exe z:\wstest\wstest_t_region_s1_nga.script + testexecute.exe z:\wstest\wstest_t_screen_s0_nga.script testexecute.exe z:\wstest\wstest_t_screen_s1_nga.script +testexecute.exe z:\wstest\wstest_t_screenmodescaling_s0_nga.script +testexecute.exe z:\wstest\wstest_t_screenmodescaling_s1_nga.script + testexecute.exe z:\wstest\wstest_t_screendevice_s0_nga.script testexecute.exe z:\wstest\wstest_t_screendevice_s1_nga.script @@ -75,6 +97,17 @@ testexecute.exe z:\wstest\wstest_t_security_s0_nga.script testexecute.exe z:\wstest\wstest_t_security_s1_nga.script +testexecute.exe z:\wstest\wstest_t_sprite_s0_nga.script +testexecute.exe z:\wstest\wstest_t_sprite_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_transparentanim_s0_nga.script +testexecute.exe z:\wstest\wstest_t_transparentanim_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_windowfunction_s0_nga.script +testexecute.exe z:\wstest\wstest_t_windowfunction_s1_nga.script + +testexecute.exe z:\wstest\wstest_t_wsgraphs_s0_nga.script +testexecute.exe z:\wstest\wstest_t_wsgraphs_s1_nga.script testexecute.exe z:\wstest\wstest_t_window_s0_nga.script testexecute.exe z:\wstest\wstest_t_window_s1_nga.script diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserverplugins/openwfc/group/stdplugin.mmp --- a/windowing/windowserverplugins/openwfc/group/stdplugin.mmp Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserverplugins/openwfc/group/stdplugin.mmp Fri Apr 23 14:57:14 2010 +0100 @@ -78,6 +78,7 @@ //TODO Change the following line once eglsynchelper has been corrected // to be available as a dynamic library STATICLIBRARY eglsynchelper.lib +LIBRARY bitgdi.lib // needed just for CFbsDevice::DisplayMode16M call #ifdef WINS LIBRARY osbwin32.lib diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserverplugins/openwfc/src/displayrenderstage.cpp --- a/windowing/windowserverplugins/openwfc/src/displayrenderstage.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserverplugins/openwfc/src/displayrenderstage.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -27,6 +27,7 @@ #if defined(__WINS__) && defined(_DEBUG) #include "debugbardrawer.h" #endif +#include #if defined(__WINS__) && defined(_DEBUG) #define DEBUGOSB iRenderTarget->UpdateDebugWin(); @@ -249,7 +250,6 @@ return NULL; } } - } TAny* interface = NULL; @@ -312,7 +312,19 @@ TDisplayMode CDisplayRenderStage::DisplayMode() const { - return iRenderTarget->DisplayMode(); + // MWsScreenDevice::DisplayMode is queried by Wserv to reply to CWsScreenDevice::DisplayMode calls from apps or when Wserv creates + // CFbsScreenDevice whenever there are DSA clients. + // Screendriver default display mode for 32bpp has been changed from 16MAP to 16MA to maintain compatibility with 3rd party apps, + // therefore we have to report the supported screen device format instead of UI surface format. + // + // However, this method is also used by flickerbuffer render stage to determine pixel format for off-screen rendering target, + // which must match UI surface format. Since we cannot return two different values in 32bpp case, this method will always return the + // value from screendriver. Flickerbuffer render stage need to change to deal with this. + // + const TInt KThirtyTwoBpp = 32; + const TDisplayMode dm = iRenderTarget->DisplayMode(); + const TInt bpp = TDisplayModeUtils::NumDisplayModeBitsPerPixel(dm); + return bpp == KThirtyTwoBpp ? CFbsDevice::DisplayMode16M() : dm; } TSize CDisplayRenderStage::SizeInPixels() const diff -r 3aa07f06a4b7 -r 31d52bbe209c windowing/windowserverplugins/openwfc/src/fbrenderstage.cpp --- a/windowing/windowserverplugins/openwfc/src/fbrenderstage.cpp Tue Apr 20 16:38:10 2010 +0100 +++ b/windowing/windowserverplugins/openwfc/src/fbrenderstage.cpp Fri Apr 23 14:57:14 2010 +0100 @@ -19,6 +19,7 @@ #include #include "displaypolicy.h" #include "utils.h" +#include #if defined(__WINS__) && defined(_DEBUG) #define DEBUGOSB iRenderTarget->UpdateDebugWin(); @@ -154,7 +155,18 @@ if (iniFile->FindVar(iNextScreenDevice->ScreenNumber(), KFlickerBufferMode, flickerBufferModeName)) displayMode = ParseDisplayMode(flickerBufferModeName); if (displayMode == ENone) - displayMode = iNextScreenDevice->DisplayMode(); + { + // Display render stage MWsScreenDevice::DisplayMode now reports the supported screendriver display mode in 32bpp. + // It is necessary in order to maintain BC with 3rd party apps and DSA framework. + // The reported display mode may be different from the actual UI surface pixel format, so flicker buffer + // must not rely on DisplayMode() to determine pixel format for its rendering target. + // + MWsUiBuffer* uiBuf = aNextStage->ObjectInterface(); + if (uiBuf) + { + displayMode = SgUtils::PixelFormatToDisplayMode(uiBuf->PixelFormat()); + } + } STD_ASSERT_DEBUG(displayMode!=ENone, EPluginPanicNoDisplayModeFound); const TUint32 usage = ESgUsageDirectGdiTarget | ESgUsageWindowGcSource;