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 Faisal Memon <faisal.memon@nokia.com>
Fri, 14 May 2010 15:41:33 +0100
branchNewGraphicsArchitecture
changeset 64 5c983aa672ea
parent 48 9a3b8b65fc7a
permissions -rw-r--r--
Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
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








48






9a3b8b65fc7a
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.



Faisal Memon <faisal.memon@nokia.com>


parents: 
20

diff
changeset




    27














9a3b8b65fc7a
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.



Faisal Memon <faisal.memon@nokia.com>


parents: 
20

diff
changeset




    28


#if defined(SYMBIAN_GRAPHICS_USE_OPENWF) && !defined(SYMBIAN_GRAPHICS_USE_OPENWF_MIGRATION)













9a3b8b65fc7a
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.



Faisal Memon <faisal.memon@nokia.com>


parents: 
20

diff
changeset




    29


REM Pure OpenWF implementation, so skipping proprietary compositor













9a3b8b65fc7a
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.



Faisal Memon <faisal.memon@nokia.com>


parents: 
20

diff
changeset




    30


#else








0






5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    31


#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




    32


#endif








48






9a3b8b65fc7a
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.



Faisal Memon <faisal.memon@nokia.com>


parents: 
20

diff
changeset




    33









0






5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    34


#include <wserv_std_plugins.iby>













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    35


//wserv calls eglReleaseThread() on exit













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    36


#include <egl.iby>













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    37














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    38


#include <graphics_adaptation.hby>













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    39


#if defined(INCLUDE_GRAPHICSRESOURCEADAPTER)













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    40


#	include <graphicsresource.iby>













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    41


	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




    42


#else













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    43


	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




    44


#endif













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    45














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    46


#else













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    47


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




    48


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




    49


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




    50


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




    51














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    52


#ifdef _DEBUG













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    53


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













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    54


#else













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    55


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













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    56


#endif













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    57














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    58


#endif













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    59


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




    60














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    61


#ifdef _DEBUG













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    62


ECOM_PLUGIN_UDEB(10281922.dll,10281922.rsc)













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    63


#else













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    64


ECOM_PLUGIN(10281922.dll,10281922.rsc)













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    65


#endif













5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    66














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    67














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    68














5d03bc08d59c
Revision: 201003



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


parents: 

diff
changeset




    69


#endif















FCL/sf/os/graphics