This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-glide64.
commit f632d2a649a948ba0863044e4e8961d2f395ff65 Author: Sven Eckelmann <[email protected]> Date: Sun Mar 11 19:57:03 2012 +0100 Imported Upstream version 1.99.4+37+a1c35b79de0d --- projects/msvc9/mupen64plus-video-glide64.vcproj | 78 ++++++++++++++++++++++++- src/Main.cpp | 4 +- src/TexCache.cpp | 2 +- src/m64p.h | 2 +- src/rdp.cpp | 6 +- src/wrapper/main.cpp | 9 ++- 6 files changed, 91 insertions(+), 10 deletions(-) diff --git a/projects/msvc9/mupen64plus-video-glide64.vcproj b/projects/msvc9/mupen64plus-video-glide64.vcproj index 429a004..0eac54f 100644 --- a/projects/msvc9/mupen64plus-video-glide64.vcproj +++ b/projects/msvc9/mupen64plus-video-glide64.vcproj @@ -92,7 +92,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" + ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1" > @@ -115,7 +115,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../src;../../src/wrapper;../../../mupen64plus-core/src/api" + AdditionalIncludeDirectories="../../src;../../src/wrapper;../../../mupen64plus-core/src/api;../../../mupen64plus-win32-deps/SDL-1.2.14/include" PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -133,7 +133,9 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="opengl32.lib glu32.lib ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib " GenerateDebugInformation="true" + SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" @@ -243,6 +245,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\2xsai.h" @@ -263,6 +273,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\config.cpp" @@ -275,6 +293,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\filter.cpp" @@ -287,6 +313,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\g3ext.h" @@ -303,6 +337,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\glide.h" @@ -327,6 +369,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\hq4x.cpp" @@ -339,6 +389,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\main.cpp" @@ -351,6 +409,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\wrapper\main.h" @@ -371,6 +437,14 @@ ObjectFile="$(IntDir)\wrapper\" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\wrapper\" + /> + </FileConfiguration> </File> </Filter> </Files> diff --git a/src/Main.cpp b/src/Main.cpp index 32dfddc..8f04ff4 100755 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -203,7 +203,7 @@ DWORD offset_texbuf1 = 0; BOOL capture_screen = 0; char capture_path[256]; -void (*renderCallback)() = NULL; +void (*renderCallback)(int) = NULL; static void (*l_DebugCallback)(void *, int, const char *) = NULL; static void *l_DebugCallContext = NULL; @@ -1472,7 +1472,7 @@ EXPORT void CALL ShowCFB (void) LOG ("ShowCFB ()\n"); } -EXPORT void CALL SetRenderingCallback(void (*callback)()) +EXPORT void CALL SetRenderingCallback(void (*callback)(int)) { renderCallback = callback; } diff --git a/src/TexCache.cpp b/src/TexCache.cpp index e3da672..d995a53 100755 --- a/src/TexCache.cpp +++ b/src/TexCache.cpp @@ -485,7 +485,7 @@ void GetTexInfo (int id, int tile) (cache->mod_color&mod_mask) == (modcolor&mod_mask) && (cache->mod_color1&mod_mask) == (modcolor1&mod_mask) && (cache->mod_color2&mod_mask) == (modcolor2&mod_mask) && - abs(cache->mod_factor - modfactor) < 8) + abs(static_cast<int>(cache->mod_factor - modfactor)) < 8) { FRDP (" | | | |- Texture found in cache (tmu=%d).\n", node->tmu); tex_found[id][node->tmu] = node->number; diff --git a/src/m64p.h b/src/m64p.h index c9a6b75..153258a 100755 --- a/src/m64p.h +++ b/src/m64p.h @@ -32,7 +32,7 @@ #define PLUGIN_NAME "Glide64 Video Plugin" #define PLUGIN_VERSION 0x016305 -#define VIDEO_PLUGIN_API_VERSION 0x020000 +#define VIDEO_PLUGIN_API_VERSION 0x020100 #define CONFIG_API_VERSION 0x020000 #define VIDEXT_API_VERSION 0x020000 diff --git a/src/rdp.cpp b/src/rdp.cpp index 41fb63b..f42a867 100755 --- a/src/rdp.cpp +++ b/src/rdp.cpp @@ -65,6 +65,8 @@ DWORD frame_count; // frame counter BOOL ucode_error_report = TRUE; int wrong_tile = -1; +int drawFlag = 1; // draw flag for rendering callback + #if defined(WIN32) || defined(NO_ASM) #define BYTESWAP1(s1) s1 = ((s1 & 0xff) << 24) | ((s1 & 0xff00) << 8) | ((s1 & 0xff0000) >> 8) | ((s1 & 0xff000000) >> 24); #define BYTESWAP2(s1,s2) s1 = ((s1 & 0xff) << 24) | ((s1 & 0xff00) << 8) | ((s1 & 0xff0000) >> 8) | ((s1 & 0xff000000) >> 24); \ @@ -3179,7 +3181,7 @@ val val size 1 = BYTE, 2 = WORD, 4 = DWORD output: none *******************************************************************/ -EXPORT void CALL FBRead(DWORD addr) +EXPORT void CALL FBRead(unsigned int addr) { LOG ("FBRead ()\n"); @@ -3256,7 +3258,7 @@ val val size 1 = BYTE, 2 = WORD, 4 = DWORD output: none *******************************************************************/ -EXPORT void CALL FBWrite(DWORD addr, DWORD size) +EXPORT void CALL FBWrite(unsigned int addr, unsigned int size) { LOG ("FBWrite ()\n"); if (cpu_fb_ignore) diff --git a/src/wrapper/main.cpp b/src/wrapper/main.cpp index 12da5cb..09427e7 100755 --- a/src/wrapper/main.cpp +++ b/src/wrapper/main.cpp @@ -43,6 +43,8 @@ extern void FindBestDepthBias(); extern int getEnableFBO(); extern int getDisableAuxbuf(); +extern int drawFlag; // draw flag for rendering callback + #ifdef WIN32 PFNGLACTIVETEXTUREARBPROC glActiveTextureARB; PFNGLATTACHOBJECTARBPROC glAttachObjectARB; @@ -1546,14 +1548,17 @@ grBufferClear( GrColor_t color, GrAlpha_t alpha, FxU32 depth ) } -extern void (*renderCallback)(); +extern void (*renderCallback)(int); // #include <unistd.h> FX_ENTRY void FX_CALL grBufferSwap( FxU32 swap_interval ) { if(renderCallback) - (*renderCallback)(); + (*renderCallback)(drawFlag); + drawFlag = 1; //TODO: set drawFlag to 0 here + //TODO: need to find the proper place to set drawFlag to 1 when a frame has been rendered + int i; WriteLog(M64MSG_VERBOSE, "grBufferSwap(%d)\r\n", swap_interval); //printf("swap\n"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
