Mercurial Mercurial > oss > FCL > sf > os > graphics / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
windowing/windowserver/group/wserv.iby
author William Roberts <williamr@symbian.org>
Tue, 20 Apr 2010 16:24:43 +0100
branchNewGraphicsArchitecture
changeset 34 76efc8f9f7b4
parent 20 82a87c384766
child 48 9a3b8b65fc7a
permissions -rw-r--r--
Apply Faisal's first patch from Bug 2354 - First resolve some the the bit rot in graphics MCL to get it to compile, then fix some performance issues in OpenWF
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     1
 
/*
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     2
 
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     3
 
* All rights reserved.
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     4
 
* This component and the accompanying materials are made available
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     5
 
* under the terms of "Eclipse Public License v1.0"
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     6
 
* which accompanies this distribution, and is available
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     7
 
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     8
 
*
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
     9
 
* Initial Contributors:
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    10
 
* Nokia Corporation - initial contribution.
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    11
 
*
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    12
 
* Contributors:
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    13
 
*
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    14
 
* Description:
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    15
 
*
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    16
 
*/
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    17
 
#ifndef __WSERV_IBY__
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    18
 
#define __WSERV_IBY__
5d03bc08d59c Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff changeset 
    19
 












5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    20


REM Window Server - defaults to exporting the non-GCE based build













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    21














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    22


#ifdef SYMBIAN_GRAPHICS_USE_GCE













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    23


file=ABI_DIR\BUILD_DIR\wserv_nga.exe 	System\Libs\EwSrv.exe













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    24


file=ABI_DIR\BUILD_DIR\ws32_nga.dll 	System\Libs\Ws32.dll













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    25


file=ABI_DIR\BUILD_DIR\remotegc_nga.dll	System\Libs\remotegc.dll 








20






82a87c384766
wserv.iby - sticking gce.iby #include into an #ifndef SYMBIAN_GRAPHICS_USE_OPENWF statement, as we don't have it and it kills rombuilding.



MattD <mattd@symbian.org>


parents: 
0

diff
changeset




    26


file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll













82a87c384766
wserv.iby - sticking gce.iby #include into an #ifndef SYMBIAN_GRAPHICS_USE_OPENWF statement, as we don't have it and it kills rombuilding.



MattD <mattd@symbian.org>


parents: 
0

diff
changeset




    27


#ifndef SYMBIAN_GRAPHICS_USE_OPENWF 








0






5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    28


#include <gce.iby>








20






82a87c384766
wserv.iby - sticking gce.iby #include into an #ifndef SYMBIAN_GRAPHICS_USE_OPENWF statement, as we don't have it and it kills rombuilding.



MattD <mattd@symbian.org>


parents: 
0

diff
changeset




    29


#endif








0






5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    30


#include <wserv_std_plugins.iby>













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    31


//wserv calls eglReleaseThread() on exit













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    32


#include <egl.iby>













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    33














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    34


#include <graphics_adaptation.hby>













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    35


#if defined(INCLUDE_GRAPHICSRESOURCEADAPTER)













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    36


#	include <graphicsresource.iby>













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    37


	file=ABI_DIR\BUILD_DIR\graphicsresourcewrapper.dll	System\Libs\graphicsresourcewrapper.dll 













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    38


#else













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    39


	file=ABI_DIR\BUILD_DIR\graphicsresourcewrapper_stub.dll	System\Libs\graphicsresourcewrapper.dll 













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    40


#endif













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    41














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    42


#else













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    43


file=ABI_DIR\BUILD_DIR\wserv_nonnga.exe 		System\Libs\EwSrv.exe













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    44


file=ABI_DIR\BUILD_DIR\ws32_nonnga.dll 			System\Libs\Ws32.dll













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    45


file=ABI_DIR\BUILD_DIR\remotegc_nonnga.dll		System\Libs\remotegc.dll 













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    46


file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nonnga.dll	System\Libs\WsGraphicDrawer.dll 













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    47














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    48


#ifdef _DEBUG













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    49


ECOM_PLUGIN_UDEB(2001B70B.dll,2001B70B.rsc)













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    50


#else













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    51


ECOM_PLUGIN(2001B70B.dll,2001B70B.rsc)













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    52


#endif













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    53














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    54


#endif













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    55


file=ABI_DIR\BUILD_DIR\w32stdgraphic.dll	System\Libs\W32StdGraphic.dll













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    56














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    57


#ifdef _DEBUG













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    58


ECOM_PLUGIN_UDEB(10281922.dll,10281922.rsc)













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    59


#else













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    60


ECOM_PLUGIN(10281922.dll,10281922.rsc)













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    61


#endif













5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    62














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    63














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    64














5d03bc08d59c
Revision: 201003



Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>


parents: 

diff
changeset




    65


#endif















FCL/sf/os/graphics