# HG changeset patch # User Matt Plumtree # Date 1288691012 0 # Node ID b62870f3934dfa6e131a2b67ae4447e3438314f7 # Parent 916c862ecaf1b075750aee7c21ab953c52207505 Change Syborg to use KhronosAPIWrapper instead of syborg-graphicswrapper diff -r 916c862ecaf1 -r b62870f3934d symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_graphicsdevice.py --- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_graphicsdevice.py Wed Oct 27 11:48:18 2010 +0100 +++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_graphicsdevice.py Tue Nov 02 09:43:32 2010 +0000 @@ -61,9 +61,9 @@ # Try open the syborg graphicswrapper library try: if( self.host_os == self.OS_WINDOWS ): - libname = "syborg-graphicswrapper.dll" + libname = "KhronosAPIWrapper.dll" elif( self.host_os == self.OS_LINUX ): - libname = "syborg-graphicswrapper.so" + libname = "KhronosAPIWrapper.so" else: # We should never end up here since the operating system check is done above sys.exit( "syborg_graphicsdevice: library loading failed. Os not supported!" ) @@ -74,9 +74,9 @@ sys.exit( error_msg ) # Create an instance of syborg graphics wrapper - self.obj = self.library.create_SyborgGraphicsWrapper() + self.obj = self.library.create_SimulatorGraphicsWrapper() - self.library.initialize_SyborgGraphicsWrapper( self.obj ) + self.library.initialize_SimulatorGraphicsWrapper( self.obj ) self.initialize_graphics_callback() self.irqenable = 0 @@ -163,7 +163,7 @@ self.framebuffer_memregion = qemu.memregion( value, gmemsize ) self.memregion_framebuffer_base = self.framebuffer_memregion.region_host_addr() # Ready to finalise graphics initialization - if( self.library.reset_SyborgGraphicsWrapper( self.obj, self.memregion_framebuffer_base, self.memregion_cmd_base ) != 0 ): + if( self.library.reset_SimulatorGraphicsWrapper( self.obj, self.memregion_framebuffer_base, self.memregion_cmd_base ) != 0 ): sys.exit("syborg_graphicsdevice: Syborg graphicsutils library not initialized correctly!") else: reg_write_error = "syborg_graphicsdevice: Illegal register write to: ", offset