# HG changeset patch # User Gareth Stockwell # Date 1285326423 -3600 # Node ID 7fc47a6656f36e96e360bce8b877d660dfbf7a37 # Parent 19c4533e15672f3566a9619a4b7a3b20bca368ef Removed syborg-graphicswrapper model library This has been moved to the adapt/graphics.simulator package - see changeset 563aa0c4cea3. diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/Makefile --- a/symbian-qemu-0.9.1-12/model-libraries/Makefile Fri Sep 24 13:30:20 2010 +0100 +++ b/symbian-qemu-0.9.1-12/model-libraries/Makefile Fri Sep 24 12:07:03 2010 +0100 @@ -14,7 +14,7 @@ .phony: all clean install distclean # Append new model library dirs here. -subdirs := nvmemmory syborg-graphicswrapper +subdirs := nvmemmory all clean install distclean: for d in $(subdirs); do $(MAKE) -C $$d $@; done diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Makefile --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Makefile Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# Copyright (c) 2010 Symbian Foundation. -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Description: -# Toplevel Makefile to build syborg-graphicswrapper library in either debug or release mode - -.phony: all clean install distclean - - -# Ensure DEBUG_LIBS is defined to make a debug build -ifneq ($(DEBUG_LIBS),) -build_dir=Debug -else -build_dir=Release -endif - -all clean install distclean: - $(MAKE) -C $(build_dir) $@ -f ../target.mak - - diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/ReadMe.txt --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/ReadMe.txt Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -======================================================================== - DYNAMIC LINK LIBRARY : syborg-graphicswrapper Project Overview -======================================================================== - -AppWizard has created this syborg-graphicswrapper DLL for you. - -This file contains a summary of what you will find in each of the files that -make up your syborg-graphicswrapper application. - -syborg-graphicswrapper.vcproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - -syborg-graphicswrapper.cpp - This is the main DLL source file. - -syborg-graphicswrapper.h - This file contains a class declaration. - -AssemblyInfo.cpp - Contains custom attributes for modifying assembly metadata. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Release/BuildLog.htm Binary file symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Release/BuildLog.htm has changed diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Release/RCa04556 Binary file symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/Release/RCa04556 has changed diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/app.ico Binary file symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/app.ico has changed diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.cpp Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -// This is the main DLL file. - -#include "platformtypes.h" -#include -#include //Registers and enums -#include //mutex -#include -#include "syborg-graphicswrapper.h" - -SyborgGraphicsWrapper::SyborgGraphicsWrapper() - { - } - -SyborgGraphicsWrapper::~SyborgGraphicsWrapper() - { - delete m_wrapper; - m_wrapper = 0; - - Psu::platform_release_semaphore(m_outputBufferSemaphore); - } - -int SyborgGraphicsWrapper::Reset( uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase ) - { - int ret = -1; - if ( m_wrapper ) - { - delete m_wrapper; - } - m_wrapper = NULL; - - uint8_t *cmd_buffer = (uint8_t *)aCommandMemBase; - uint8_t *frame_buffer = (uint8_t *)aGraphicsMemBase; - if( (cmd_buffer != NULL) && (frame_buffer != NULL) ) - { - m_wrapper = new KhronosAPIWrapper( (MGraphicsVHWCallback*)this, - frame_buffer, &cmd_buffer[VVHW_INPUT_BASE], &cmd_buffer[VVHW_OUTPUT_BASE] ); - //Reset synchronisation mechanisms - Psu::platform_release_semaphore(m_outputBufferSemaphore); - Psu::platform_create_semaphore(m_outputBufferSemaphore, 1, 1); - ret = 0; - } - else - { - ret = -1; - } - return ret; - } - -void SyborgGraphicsWrapper::LockOutputBuffer() - { - #ifdef KHRONOS_API_W_MULTITHREAD - Psu::platform_wait_for_signal(m_outputBufferSemaphore); - #endif - } - -void SyborgGraphicsWrapper::ReleaseOutputBuffer(){} - -void SyborgGraphicsWrapper::ProcessingDone(int i) - { - m_pythonCallBack( i ); - } - -extern "C" - { - SYBORG_GRAPHICSWRAPPER_API SyborgGraphicsWrapper* create_SyborgGraphicsWrapper() - { - return new SyborgGraphicsWrapper(); - } - SYBORG_GRAPHICSWRAPPER_API int initialize_SyborgGraphicsWrapper( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - Psu::platform_create_semaphore(m_outputBufferSemaphore, 1, 1); - // Change to proper error handling - return 0; - } - - SYBORG_GRAPHICSWRAPPER_API int set_GraphicsCallBack( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, int (*aGraphicsCallBack) (int) ) - { - m_pythonCallBack = aGraphicsCallBack; - // Change to proper error handling - return 0; - } - - SYBORG_GRAPHICSWRAPPER_API int reset_SyborgGraphicsWrapper( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase ) - { - return aSyborgGraphicsWrapper->Reset( aGraphicsMemBase, aCommandMemBase ); - } - - SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferTail( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->InputBufferTail(); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferHead( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->InputBufferHead( ); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferReadCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->InputBufferReadCount( ); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferWriteCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->InputBufferWriteCount( ); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputMaxTailIndex( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->InputMaxTailIndex( ); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_cmd_memsize( void ) - { - return (VVI_PARAMETERS_INPUT_MEMORY_SIZE + - VVI_PARAMETERS_OUTPUT_MEMORY_SIZE); - } - SYBORG_GRAPHICSWRAPPER_API uint32_t get_framebuffer_memsize( void ) - { - return VVI_FRAMEBUFFER_MEMORY_SIZE; - } - - - SYBORG_GRAPHICSWRAPPER_API unsigned int execute_command( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - return m_wrapper->Execute( ); - } - SYBORG_GRAPHICSWRAPPER_API void set_InputBufferTail( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal ) - { - m_wrapper->SetInputBufferTail( aVal ); - } - SYBORG_GRAPHICSWRAPPER_API void set_InputBufferHead( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal ) - { - m_wrapper->SetInputBufferHead( aVal ); - } - SYBORG_GRAPHICSWRAPPER_API void set_InputBufferReadCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal ) - { - m_wrapper->SetInputBufferReadCount( aVal ); - } - SYBORG_GRAPHICSWRAPPER_API void set_InputBufferWriteCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal ) - { - m_wrapper->SetInputBufferWriteCount( aVal ); - } - SYBORG_GRAPHICSWRAPPER_API void set_InputMaxTailIndex( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal ) - { - m_wrapper->SetInputMaxTailIndex( aVal ); - } - SYBORG_GRAPHICSWRAPPER_API void signal_outputbuffer_semafore( SyborgGraphicsWrapper* aSyborgGraphicsWrapper ) - { - #ifdef KHRONOS_API_W_MULTITHREAD - Psu::platform_signal_semaphore(m_outputBufferSemaphore); - #endif - } - - } \ No newline at end of file diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.h --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.h Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -#ifndef _SYBORG_GRAPHICSWRAPPER_H -#define _SYBORG_GRAPHICSWRAPPER_H - -#pragma once - -#ifdef WIN32 -#ifdef SYBORG_GRAPHICSWRAPPER_EXPORTS -#define SYBORG_GRAPHICSWRAPPER_API __declspec(dllexport) -#else -#define SYBORG_GRAPHICSWRAPPER_API __declspec(dllimport) -#endif -#else -#define SYBORG_GRAPHICSWRAPPER_API -#endif - -Psu::PLATFORM_SEMAPHORE_T m_outputBufferSemaphore; -int (*m_pythonCallBack)(int); -KhronosAPIWrapper* m_wrapper; - - -// Derived from GraphicsVirtualHW.lisa -static const int VVHW_BUFFER (0x3000000); -static const int VVHW_INPUT_BUFFER (0x1000000); -static const int VVHW_INPUT_BASE(0x0); -static const int VVHW_OUTPUT_BUFFER (0x1000000); -static const int VVHW_OUTPUT_BASE(0x1000000); -static const int VVHW_FRAME_BUFFER (0x1000000); -static const int VVHW_FRAME_BASE(0x2000000); - -class SyborgGraphicsWrapper : public MGraphicsVHWCallback - { - public: - - SyborgGraphicsWrapper(); - ~SyborgGraphicsWrapper(); - - int Reset( uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase ); - - virtual void LockOutputBuffer(); - virtual void ReleaseOutputBuffer(); - virtual void ProcessingDone(int i); - - private: - }; - - -#endif // _SYBORG_GRAPHICSWRAPPER_H \ No newline at end of file diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.sln --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.sln Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syborg-graphicswrapper", "syborg-graphicswrapper.vcproj", "{93690C8A-9167-4A2D-9682-3E437A31347D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {93690C8A-9167-4A2D-9682-3E437A31347D}.Debug|Win32.ActiveCfg = Debug|Win32 - {93690C8A-9167-4A2D-9682-3E437A31347D}.Debug|Win32.Build.0 = Debug|Win32 - {93690C8A-9167-4A2D-9682-3E437A31347D}.Release|Win32.ActiveCfg = Release|Win32 - {93690C8A-9167-4A2D-9682-3E437A31347D}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.suo Binary file symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.suo has changed diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj.NOE.jahyvone.user --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/syborg-graphicswrapper.vcproj.NOE.jahyvone.user Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ - - - - - - - - - - - diff -r 19c4533e1567 -r 7fc47a6656f3 symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/target.mak --- a/symbian-qemu-0.9.1-12/model-libraries/syborg-graphicswrapper/target.mak Fri Sep 24 13:30:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# Copyright (c) 2010 Symbian Foundation. -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of the License "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Description: -# Bottom level Makefile to build syborg-graphicswrapper library in the current directory - -include ../../../qemu-symbian-svp/config-host.mak - -sources := syborg-graphicswrapper.cpp -objs := syborg-graphicswrapper.o -libname := libsyborg-graphicswrapper.so -soname := $(libname).1 -targ := $(soname).0 - -.phony: all build clean install distclean uninstall - -cflags=-DHAVE_STDINT_H -DSYBORG_GRAPHICSWRAPPER_EXPORTS -ifneq ($(DEBUG_LIBS),) -cflags+="-O0 -g" -else -cflags+=-O2 -endif - -vpath %.cpp .. - -all: $(targ) - -%.o : %.cpp - g++ $(cflags) -fPIC -I../../commoninc -c -o $@ $< - -$(objs): $(sources) - -$(targ): $(objs) - g++ $(cflags) -shared -Wl,-soname,$(soname) -Wl,-l,stdc++ -o $@ $(objs) - -clean: - rm -f $(objs) $(targ) - -install: $(targ) - if [ ! -d "$(DESTDIR)$(libdir)" ]; then mkdir -p "$(DESTDIR)$(libdir)"; fi && \ - $(INSTALL) -m 755 $(targ) "$(DESTDIR)$(libdir)" && \ - rm -f "$(DESTDIR)$(libdir)/$(libname)" && \ - ln -s "$(DESTDIR)$(libdir)/$(targ)" "$(DESTDIR)$(libdir)/$(libname)" - -distclean: clean -# Nothing for distclean - -uninstall: - rm -f "$(DESTDIR)$(libdir)/$(libname)" "$(DESTDIR)$(libdir)/$(targ)" && \ - files=`ls -A "$(DESTDIR)$(libdir)"` && \ - if [ -z "$$files" ]; then rmdir "$(DESTDIR)$(libdir)"; fi - - -