Emulation/mupen64plus-video-rice
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-video-rice.git synced 2024-05-31 18:27:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added MSVC8 project file. Fixed a bunch of small incompatibilities with VC8 compiler

Browse source
This commit is contained in:
GoedekenR 2009-12-27 11:30:16 -05:00
parent db26452528
commit 87766526e8
51 changed files with 928 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

635
projects/msvc8/mupen64plus-video-rice.vcproj Normal file
View file

@ -0,0 +1,635 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="mupen64plus-video-rice"
ProjectGUID="{7D4AFF6A-B7D9-4C25-975A-038B8079098E}"
RootNamespace="mupen64plusvideorice"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\include;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\include"
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib glu32.lib ..\..\..\mupen64plus-win32-deps\SDL-1.2.14\lib\SDL.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MUPEN64PLUSVIDEORICE_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\Blender.cpp"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGImage.c"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGUtils.c"
>
</File>
<File
RelativePath="..\..\src\liblinux\bmp.c"
>
</File>
<File
RelativePath="..\..\src\CNvTNTCombiner.cpp"
>
</File>
<File
RelativePath="..\..\src\Combiner.cpp"
>
</File>
<File
RelativePath="..\..\src\CombinerTable.cpp"
>
</File>
<File
RelativePath="..\..\src\Config.cpp"
>
</File>
<File
RelativePath="..\..\src\ConvertImage.cpp"
>
</File>
<File
RelativePath="..\..\src\ConvertImage16.cpp"
>
</File>
<File
RelativePath="..\..\src\Debugger.cpp"
>
</File>
<File
RelativePath="..\..\src\DecodedMux.cpp"
>
</File>
<File
RelativePath="..\..\src\DeviceBuilder.cpp"
>
</File>
<File
RelativePath="..\..\src\DirectXDecodedMux.cpp"
>
</File>
<File
RelativePath="..\..\src\FrameBuffer.cpp"
>
</File>
<File
RelativePath="..\..\src\GeneralCombiner.cpp"
>
</File>
<File
RelativePath="..\..\src\GraphicsContext.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLCombiner.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLCombinerNV.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLCombinerTNT2.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLDecodedMux.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLExtCombiner.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLExtRender.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLFragmentShaders.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLGraphicsContext.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLRender.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLRenderExt.cpp"
>
</File>
<File
RelativePath="..\..\src\OGLTexture.cpp"
>
</File>
<File
RelativePath="..\..\src\osal_dynamiclib_win32.c"
>
</File>
<File
RelativePath="..\..\src\liblinux\pngrw.c"
>
</File>
<File
RelativePath="..\..\src\Render.cpp"
>
</File>
<File
RelativePath="..\..\src\RenderBase.cpp"
>
</File>
<File
RelativePath="..\..\src\RenderExt.cpp"
>
</File>
<File
RelativePath="..\..\src\RenderTexture.cpp"
>
</File>
<File
RelativePath="..\..\src\RSP_Parser.cpp"
>
</File>
<File
RelativePath="..\..\src\RSP_S2DEX.cpp"
>
</File>
<File
RelativePath="..\..\src\Texture.cpp"
>
</File>
<File
RelativePath="..\..\src\TextureFilters.cpp"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_2xsai.cpp"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_hq2x.cpp"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_hq4x.cpp"
>
</File>
<File
RelativePath="..\..\src\TextureManager.cpp"
>
</File>
<File
RelativePath="..\..\src\VectorMath.cpp"
>
</File>
<File
RelativePath="..\..\src\Video.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\src\Blender.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGDLL.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGImage.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGLibPNG.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\BMGUtils.h"
>
</File>
<File
RelativePath="..\..\src\CNvTNTCombiner.h"
>
</File>
<File
RelativePath="..\..\src\COLOR.h"
>
</File>
<File
RelativePath="..\..\src\Combiner.h"
>
</File>
<File
RelativePath="..\..\src\CombinerDefs.h"
>
</File>
<File
RelativePath="..\..\src\Config.h"
>
</File>
<File
RelativePath="..\..\src\ConvertImage.h"
>
</File>
<File
RelativePath="..\..\src\CritSect.h"
>
</File>
<File
RelativePath="..\..\src\CSortedList.h"
>
</File>
<File
RelativePath="..\..\src\Debugger.h"
>
</File>
<File
RelativePath="..\..\src\DecodedMux.h"
>
</File>
<File
RelativePath="..\..\src\DeviceBuilder.h"
>
</File>
<File
RelativePath="..\..\src\DirectXDecodedMux.h"
>
</File>
<File
RelativePath="..\..\src\ExtendedRender.h"
>
</File>
<File
RelativePath="..\..\src\FrameBuffer.h"
>
</File>
<File
RelativePath="..\..\src\GeneralCombiner.h"
>
</File>
<File
RelativePath="..\..\src\GraphicsContext.h"
>
</File>
<File
RelativePath="..\..\src\IColor.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\inffixed.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\jpegrw.h"
>
</File>
<File
RelativePath="..\..\src\OGLCombiner.h"
>
</File>
<File
RelativePath="..\..\src\OGLCombinerNV.h"
>
</File>
<File
RelativePath="..\..\src\OGLCombinerTNT2.h"
>
</File>
<File
RelativePath="..\..\src\OGLDecodedMux.h"
>
</File>
<File
RelativePath="..\..\src\OGLExtCombiner.h"
>
</File>
<File
RelativePath="..\..\src\OGLExtRender.h"
>
</File>
<File
RelativePath="..\..\src\OGLFragmentShaders.h"
>
</File>
<File
RelativePath="..\..\src\OGLGraphicsContext.h"
>
</File>
<File
RelativePath="..\..\src\OGLRender.h"
>
</File>
<File
RelativePath="..\..\src\OGLTexture.h"
>
</File>
<File
RelativePath="..\..\src\osal_dynamiclib.h"
>
</File>
<File
RelativePath="..\..\src\osal_preproc.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\pngrw.h"
>
</File>
<File
RelativePath="..\..\src\RDP_Texture.h"
>
</File>
<File
RelativePath="..\..\src\Render.h"
>
</File>
<File
RelativePath="..\..\src\RenderBase.h"
>
</File>
<File
RelativePath="..\..\src\RenderTexture.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI0.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI1.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI2.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI2_ext.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI_Others.h"
>
</File>
<File
RelativePath="..\..\src\RSP_GBI_Sprite2D.h"
>
</File>
<File
RelativePath="..\..\src\RSP_Parser.h"
>
</File>
<File
RelativePath="..\..\src\RSP_S2DEX.h"
>
</File>
<File
RelativePath="..\..\src\Texture.h"
>
</File>
<File
RelativePath="..\..\src\TextureFilters.h"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_hq2x.h"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_hq4x.h"
>
</File>
<File
RelativePath="..\..\src\TextureFilters_lq2x.h"
>
</File>
<File
RelativePath="..\..\src\TextureManager.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\tiffrw.h"
>
</File>
<File
RelativePath="..\..\src\Timing.h"
>
</File>
<File
RelativePath="..\..\src\typedefs.h"
>
</File>
<File
RelativePath="..\..\src\ucode.h"
>
</File>
<File
RelativePath="..\..\src\UcodeDefs.h"
>
</File>
<File
RelativePath="..\..\src\VectorMath.h"
>
</File>
<File
RelativePath="..\..\src\version.h"
>
</File>
<File
RelativePath="..\..\src\VertexShaderConstantDef.h"
>
</File>
<File
RelativePath="..\..\src\Video.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\zconf.h"
>
</File>
<File
RelativePath="..\..\src\liblinux\zlib.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

6
src/Blender.cpp
View file

@ -263,7 +263,7 @@ Possible Blending Factors:
Enable();
break;
default:
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
{
uint32 dwM1A_1 = (gRDP.otherMode.blender>>14) & 0x3;
@ -309,7 +309,7 @@ Possible Blending Factors:
break;
}
#ifdef _DEBUG
#ifdef DEBUGGER
//if( (blendmode_1>>2) != blendmode_2 )
//{
// DebuggerAppendMsg("Warning: in 1 cycle mode, blend1!=blend2");
@ -376,7 +376,7 @@ Possible Blending Factors:
Enable();
break;
default:
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
{
uint32 dwM1A_1 = (gRDP.otherMode.blender>>14) & 0x3;

4
src/CNvTNTCombiner.cpp
View file

@ -263,7 +263,7 @@ int CNvTNTCombiner::SaveParserResult(TNT2CombinerSaveType &result)
m_vCompiledTNTSettings.push_back(result);
m_lastIndexTNT = m_vCompiledTNTSettings.size()-1;
#ifdef _DEBUG
#ifdef DEBUGGER
if( logCombiners )
{
DisplaySimpleMuxString();
@ -299,7 +299,7 @@ void CNvTNTCombiner::ParseDecodedMuxForConstants(TNT2CombinerSaveType &res)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
extern const char *translatedCombTypes[];
void CNvTNTCombiner::DisplaySimpleMuxString()
{

2
src/CNvTNTCombiner.h
View file

@ -82,7 +82,7 @@ protected:
virtual void ParseDecodedMuxForConstants(TNT2CombinerSaveType &res);
int SaveParserResult(TNT2CombinerSaveType &result);
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString();
#endif
std::vector<TNT2CombinerSaveType> m_vCompiledTNTSettings;

10
src/Combiner.cpp
View file

@ -61,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// "1 ", "0 ",
//};
#ifdef _DEBUG
#ifdef DEBUGGER
const char *constStrs[] = {
"MUX_0",
"MUX_1",
@ -362,7 +362,7 @@ bool IsTxtrUsed(N64CombinerType &m)
void CColorCombiner::InitCombinerMode(void)
{
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(cycleTypeStrs[gRDP.otherMode.cycle_type]);
if( debuggerDropDecodedMux )
@ -397,7 +397,7 @@ void CColorCombiner::InitCombinerMode(void)
bool bConkerHideShadow=false;
void CColorCombiner::UpdateCombiner(uint32 dwMux0, uint32 dwMux1)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropDecodedMux )
{
debuggerDropDecodedMux = false;
@ -468,7 +468,7 @@ void CColorCombiner::UpdateCombiner(uint32 dwMux0, uint32 dwMux1)
m_decodedMux.SplitComplexStages();
m_DecodedMuxList.add(m_decodedMux.m_u64Mux, *m_pDecodedMux);
#ifdef _DEBUG
#ifdef DEBUGGER
if( logCombiners )
{
TRACE0("Add a new mux");
@ -487,7 +487,7 @@ void CColorCombiner::UpdateCombiner(uint32 dwMux0, uint32 dwMux1)
}
#ifdef _DEBUG
#ifdef DEBUGGER
void CColorCombiner::DisplayMuxString(void)
{
if( gRDP.otherMode.cycle_type == CYCLE_TYPE_COPY)

2
src/Combiner.h
View file

@ -43,7 +43,7 @@ public:
virtual void InitCombinerBlenderForSimpleTextureDraw(uint32 tile=0)=0;
virtual void DisableCombiner(void)=0;
#ifdef _DEBUG
#ifdef DEBUGGER
virtual void DisplaySimpleMuxString(void);
virtual void DisplayMuxString(void);
#endif

5
src/Config.cpp
View file

@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdlib.h>
#include <limits.h> // PATH_MAX
#include "osal_preproc.h"
#include "m64p_types.h"
#include "m64p_plugin.h"
#include "m64p_config.h"
@ -356,7 +357,7 @@ bool isMMXSupported()
{
int IsMMXSupported = 0;
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__asm
{
mov eax,1 // CPUID level 1
@ -389,7 +390,7 @@ bool isSSESupported()
int SSESupport = 0;
// And finally, check the CPUID for Streaming SIMD Extensions support.
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
_asm{
mov eax, 1 // Put a "1" in eax to tell CPUID to get the feature bits
cpuid // Perform CPUID (puts processor feature info into EDX)

12
src/ConvertImage.cpp
View file

@ -242,7 +242,7 @@ void ConvertIA4(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long)pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif
@ -331,7 +331,7 @@ void ConvertIA8(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long)pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif
@ -476,7 +476,7 @@ void ConvertI4(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long) pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif
@ -752,7 +752,7 @@ void ConvertCI4_IA16(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long) pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif
@ -847,7 +847,7 @@ void ConvertCI8_RGBA16(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long) pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif
@ -927,7 +927,7 @@ void ConvertCI8_IA16(CTexture *pTexture, const TxtrInfo &tinfo)
uint8 * pSrc = (uint8*)(tinfo.pPhysicalAddress);
#ifdef _DEBUG
#ifdef DEBUGGER
if (((long) pSrc) % 4) TRACE0("Texture src addr is not aligned to 4 bytes, check me");
#endif

2
src/Debugger.cpp
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "m64p_plugin.h"
#include "typedefs.h"
#ifndef _DEBUG
#ifndef DEBUGGER
void __cdecl DebuggerAppendMsg(const char * Message, ...) {}
#else

2
src/Debugger.h
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "typedefs.h"
#if defined(_DEBUG)
#if defined(DEBUGGER)
// Debugger.h : header file
//

2
src/DecodedMux.cpp
View file

@ -1172,7 +1172,7 @@ void DecodedMuxForOGL14V2::UseTextureForConstant(void)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
extern const char *translatedCombTypes[];
void DecodedMux::DisplayMuxString(const char *prompt)
{

2
src/DecodedMux.h
View file

@ -140,7 +140,7 @@ public:
int CountTexels(void);
int Count(uint8 val, int cycle= -1, uint8 mask = MUX_MASK);
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplayMuxString(const char *prompt);
void DisplaySimpliedMuxString(const char *prompt);
void DisplayConstantsWithShade(uint32 flag,CombineChannel channel);

10
src/FrameBuffer.cpp
View file

@ -502,7 +502,7 @@ void TexRectToFrameBuffer_8b(uint32 dwXL, uint32 dwYL, uint32 dwXH, uint32 dwYH,
{
if( (((y+dwTop)*dwDstPitch+x+dwLeft)^0x3) > maxOff )
{
#ifdef _DEBUG
#ifdef DEBUGGER
TRACE0("Warning: Offset exceeds limit");
#endif
continue;
@ -617,7 +617,7 @@ uint32 CalculateRDRAMCRC(void *pPhysicalAddress, uint32 left, uint32 top, uint32
dwAsmHeight = height - 1;
dwAsmPitch = pitchInBytes;
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__asm
{
push eax
@ -1761,7 +1761,7 @@ void FrameBufferManager::Set_CI_addr(SetImgInfo &newCI)
default:
if( status.bHandleN64RenderTexture )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_RENDER_TEXTURE )
{
pauseAtNext = TRUE;
@ -1781,7 +1781,7 @@ void FrameBufferManager::Set_CI_addr(SetImgInfo &newCI)
}
else
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( g_CI.dwWidth == 512 && pauseAtNext && (eventToPause==NEXT_OBJ_BG || eventToPause==NEXT_SET_CIMG) )
{
DebuggerAppendMsg("Warning SetCImg: new Addr=0x%08X, fmt:%s size=%sb, Width=%d\n",
@ -1974,7 +1974,7 @@ void FrameBufferManager::CopyBufferToRDRAM(uint32 addr, uint32 fmt, uint32 siz,
}
#ifdef _DEBUG
#ifdef DEBUGGER
void FrameBufferManager::DisplayRenderTexture(int infoIdx)
{
if( infoIdx < 0 )

2
src/FrameBuffer.h
View file

@ -85,7 +85,7 @@ public:
virtual void StoreBackBufferToRDRAM(uint32 addr, uint32 fmt, uint32 siz, uint32 width,
uint32 height, uint32 bufWidth, uint32 bufHeight, uint32 startaddr=0xFFFFFFFF,
uint32 memsize=0xFFFFFFFF, uint32 pitch=0, SURFFORMAT surf_fmt=SURFFMT_A8R8G8B8) {}
#ifdef _DEBUG
#ifdef DEBUGGER
virtual void DisplayRenderTexture(int infoIdx = -1);
#endif

6
src/GeneralCombiner.cpp
View file

@ -59,7 +59,7 @@ bool isComb(uint32 val)
return (val&MUX_MASK)==MUX_COMBINED;
}
#ifdef _DEBUG
#ifdef DEBUGGER
const char* BlendFuncStr[] = {
"Enable both",
"Disable alpha",
@ -935,7 +935,7 @@ int CGeneralCombiner::ParseDecodedMux()
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( !resultIsGood )
{
DecodedMux &mux = *(*m_ppGeneralDecodedMux);
@ -1021,7 +1021,7 @@ int CGeneralCombiner::SaveParserResult(GeneralCombinerInfo &result)
int CGeneralCombiner::FindCompiledMux( )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners || debuggerDropGeneralCombiners )
{
m_vCompiledCombinerStages.clear();

2
src/GeneralCombiner.h
View file

@ -215,7 +215,7 @@ protected:
bool IsTextureUsedInStage(GeneralCombineStage &stage);
#ifdef _DEBUG
#ifdef DEBUGGER
void General_DisplayBlendingStageInfo(GeneralCombinerInfo &ci);
#endif

2
src/GraphicsContext.cpp
View file

@ -65,7 +65,7 @@ void CGraphicsContext::InitWindowInfo()
bool CGraphicsContext::Initialize(uint32 dwWidth, uint32 dwHeight, BOOL bWindowed)
{
m_bWindowed = bWindowed;
m_bWindowed = (bWindowed != 0);
g_pFrameBufferManager->Initialize();
return true;

8
src/OGLCombiner.cpp
View file

@ -100,7 +100,7 @@ void COGLColorCombiner::DisableCombiner(void)
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
m_pOGLRender->SetAllTexelRepeatFlag();
}
#ifdef _DEBUG
#ifdef DEBUGGER
else
{
DebuggerAppendMsg("Check me, texture is NULL but it is enabled");
@ -124,7 +124,7 @@ void COGLColorCombiner::InitCombinerCycleCopy(void)
m_pOGLRender->BindTexture(pTexture->m_dwTextureName, 0);
m_pOGLRender->SetTexelRepeatFlags(gRSP.curTile);
}
#ifdef _DEBUG
#ifdef DEBUGGER
else
{
DebuggerAppendMsg("Check me, texture is NULL");
@ -159,7 +159,7 @@ void COGLColorCombiner::InitCombinerCycle12(void)
m_pOGLRender->BindTexture(pTexture->m_dwTextureName, 0);
m_pOGLRender->SetAllTexelRepeatFlag();
}
#ifdef _DEBUG
#ifdef DEBUGGER
else
{
DebuggerAppendMsg("Check me, texture is NULL");
@ -315,7 +315,7 @@ void COGLColorCombiner::InitCombinerBlenderForSimpleTextureDraw(uint32 tile)
m_pOGLRender->SetAlphaTestEnable(FALSE);
}
#ifdef _DEBUG
#ifdef DEBUGGER
extern const char *translatedCombTypes[];
void COGLColorCombiner::DisplaySimpleMuxString(void)
{

2
src/OGLCombiner.h
View file

@ -47,7 +47,7 @@ protected:
bool m_bSupportAdd;
bool m_bSupportSubtract;
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif

6
src/OGLCombinerNV.cpp
View file

@ -110,7 +110,7 @@ void COGLColorCombinerNvidia::InitCombinerCycle12(void)
glEnable(GL_REGISTER_COMBINERS_NV);
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
m_vCompiledSettings.clear();
@ -1017,7 +1017,7 @@ int COGLColorCombinerNvidia::SaveParserResult(const NVRegisterCombinerParserType
save.constant0 = result.constant0;
save.constant1 = result.constant1;
#ifdef _DEBUG
#ifdef DEBUGGER
memcpy(&(save.parseResult),&result, sizeof(result));
if( logCombiners )
{
@ -1073,7 +1073,7 @@ void COGLColorCombinerNvidia::ApplyFogAtFinalStage()
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
extern const char *translatedCombTypes[];
void COGLColorCombinerNvidia::DisplaySimpleMuxString(void)
{

4
src/OGLCombinerNV.h
View file

@ -102,7 +102,7 @@ typedef struct {
uint8 constant0;
uint8 constant1;
#ifdef _DEBUG
#ifdef DEBUGGER
NVRegisterCombinerParserType parseResult;
#endif
} NVRegisterCombinerSettingType;
@ -147,7 +147,7 @@ protected:
bool m_bNVSupported; // Is this NV OGL extension combiner supported by the video card driver?
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
void DisplayNVCombinerString(NVRegisterCombinerSettingType &record);
#endif

4
src/OGLCombinerTNT2.cpp
View file

@ -62,7 +62,7 @@ void COGLColorCombinerTNT2::InitCombinerCycle12(void)
{
if( !m_bOGLExtCombinerSupported ) { COGLColorCombiner4::InitCombinerCycle12(); return;}
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
m_vCompiledTNTSettings.clear();
@ -119,7 +119,7 @@ const char* COGLColorCombinerTNT2::GetOpStr(GLenum op)
}
#ifdef _DEBUG
#ifdef DEBUGGER
void COGLColorCombinerTNT2::DisplaySimpleMuxString(void)
{
COGLColorCombiner::DisplaySimpleMuxString();

2
src/OGLCombinerTNT2.h
View file

@ -49,7 +49,7 @@ protected:
bool m_bTNT2Supported; // Is this NV OGL extension combiner supported by the video card driver?
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif

12
src/OGLExtCombiner.cpp
View file

@ -146,7 +146,7 @@ void COGLColorCombiner4::InitCombinerCycle12(void)
return;
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
UpdateCombiner(m_pDecodedMux->m_dwMux0,m_pDecodedMux->m_dwMux1);
@ -167,7 +167,7 @@ void COGLColorCombiner4::InitCombinerCycle12(void)
if( m_lastIndex < 0 ) // Can not found
{
m_lastIndex = ParseDecodedMux();
#ifdef _DEBUG
#ifdef DEBUGGER
DisplaySimpleMuxString();
#endif
}
@ -545,7 +545,7 @@ int COGLColorCombiner4::SaveParsedResult(OGLExtCombinerSaveType &result)
m_vCompiledSettings.push_back(result);
m_lastIndex = m_vCompiledSettings.size()-1;
#ifdef _DEBUG
#ifdef DEBUGGER
if( logCombiners )
{
DisplaySimpleMuxString();
@ -640,7 +640,7 @@ int COGLColorCombiner4v2::SaveParsedResult(OGLExtCombinerSaveType &result)
m_vCompiledSettings.push_back(result);
m_lastIndex = m_vCompiledSettings.size()-1;
#ifdef _DEBUG
#ifdef DEBUGGER
if( logCombiners )
{
DisplaySimpleMuxString();
@ -651,7 +651,7 @@ int COGLColorCombiner4v2::SaveParsedResult(OGLExtCombinerSaveType &result)
}
#ifdef _DEBUG
#ifdef DEBUGGER
extern const char *translatedCombTypes[];
void COGLColorCombiner4::DisplaySimpleMuxString(void)
{
@ -696,7 +696,7 @@ void COGLColorCombiner2::DisplaySimpleMuxString(void)
//////////////////////////////////////////////////////////////////////////
int COGLColorCombiner4::FindCompiledMux()
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
m_vCompiledSettings.clear();

4
src/OGLExtCombiner.h
View file

@ -142,7 +142,7 @@ protected:
uint32 m_dwLastMux0;
uint32 m_dwLastMux1;
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif
@ -197,7 +197,7 @@ class COGLColorCombiner2 : public COGLColorCombiner4, CGeneralCombiner
public:
bool Initialize(void);
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif

12
src/OGLFragmentShaders.cpp
View file

@ -68,7 +68,7 @@ void COGLFragmentShaderCombiner::InitCombinerBlenderForSimpleTextureDraw(uint32
COGLColorCombiner::InitCombinerBlenderForSimpleTextureDraw(tile);
}
#ifdef _DEBUG
#ifdef DEBUGGER
void COGLFragmentShaderCombiner::DisplaySimpleMuxString(void)
{
COGLColorCombiner::DisplaySimpleMuxString();
@ -284,13 +284,13 @@ int COGL_FragmentProgramCombiner::ParseDecodedMux()
if (glGetError() != 0)
{
GLint position;
#ifdef _DEBUG
#ifdef DEBUGGER
char *str = (char*)glGetString(GL_PROGRAM_ERROR_STRING_ARB);
#endif
glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &position);
if( position >= 0 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( m_lastIndex >= 0 ) COGLColorCombiner4::DisplaySimpleMuxString();
DebugMessage(M64MSG_ERROR, "%s - %s", str, oglNewFP+position);
#endif
@ -340,7 +340,7 @@ void COGL_FragmentProgramCombiner::GenerateCombinerSettingConstants(int index)
int COGL_FragmentProgramCombiner::FindCompiledMux()
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
m_vCompiledShaders.clear();
@ -368,7 +368,7 @@ void COGL_FragmentProgramCombiner::InitCombinerCycle12(void)
return;
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerDropCombiners )
{
UpdateCombiner(m_pDecodedMux->m_dwMux0,m_pDecodedMux->m_dwMux1);
@ -420,7 +420,7 @@ void COGL_FragmentProgramCombiner::InitCombinerCycle12(void)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
void COGL_FragmentProgramCombiner::DisplaySimpleMuxString(void)
{
COGLColorCombiner::DisplaySimpleMuxString();

4
src/OGLFragmentShaders.h
View file

@ -62,7 +62,7 @@ private:
virtual void GenerateCombinerSetting(int index);
virtual void GenerateCombinerSettingConstants(int index);
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif
@ -88,7 +88,7 @@ protected:
bool m_bShaderIsSupported;
#ifdef _DEBUG
#ifdef DEBUGGER
void DisplaySimpleMuxString(void);
#endif

2
src/OGLGraphicsContext.cpp
View file

@ -332,7 +332,7 @@ int COGLGraphicsContext::ToggleFullscreen()
{
if (CoreVideo_ToggleFullScreen() == M64ERR_SUCCESS)
{
m_bWindowed = 1 - m_bWindowed;
m_bWindowed = !m_bWindowed;
if(m_bWindowed)
SetWindowMode();
else

10
src/OGLRender.cpp
View file

@ -268,7 +268,7 @@ void OGLRender::ApplyZBias(int bias)
void OGLRender::SetZBias(int bias)
{
#if defined(_DEBUG)
#if defined(DEBUGGER)
if( pauseAtNext == true )
DebuggerAppendMsg("Set zbias = %d", bias);
#endif
@ -381,7 +381,7 @@ void OGLRender::SetTexWrapS(int unitno,GLuint flag)
{
static GLuint mflag;
static GLuint mtex;
#ifdef _DEBUG
#ifdef DEBUGGER
if( unitno != 0 )
{
DebuggerAppendMsg("Check me, unitno != 0 in base ogl");
@ -708,7 +708,7 @@ void OGLRender::RenderReset()
void OGLRender::SetAlphaTestEnable(BOOL bAlphaTestEnable)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( bAlphaTestEnable && debuggerEnableAlphaTest )
#else
if( bAlphaTestEnable )
@ -720,7 +720,7 @@ void OGLRender::SetAlphaTestEnable(BOOL bAlphaTestEnable)
void OGLRender::BindTexture(GLuint texture, int unitno)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( unitno != 0 )
{
DebuggerAppendMsg("Check me, base ogl bind texture, unit no != 0");
@ -741,7 +741,7 @@ void OGLRender::DisBindTexture(GLuint texture, int unitno)
void OGLRender::EnableTexUnit(int unitno, BOOL flag)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( unitno != 0 )
{
DebuggerAppendMsg("Check me, in the base ogl render, unitno!=0");

18
src/RDP_Texture.h
View file

@ -94,7 +94,7 @@ inline uint32 ReverseDXT(uint32 val, uint32 lrs, uint32 width, uint32 size)
inline void UnswapCopy( void *src, void *dest, uint32 numBytes )
{
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__asm
{
mov ecx, 0
@ -283,7 +283,7 @@ Done:
inline void DWordInterleave( void *mem, uint32 numDWords )
{
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__asm {
mov esi, dword ptr [mem]
mov edi, dword ptr [mem]
@ -336,7 +336,7 @@ DWordInterleaveLoop:
inline void QWordInterleave( void *mem, uint32 numDWords )
{
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__asm
{
// Interleave the line on the qword
@ -658,7 +658,7 @@ bool CalculateTileSizes_method_2(int tileno, TMEMLoadMapInfo *info, TxtrInfo &gt
tile.bMirrorT, dwTileHeight, gti.HeightToCreate, gti.HeightToLoad);
tile.dwHeight = gti.HeightToCreate;
#ifdef _DEBUG
#ifdef DEBUGGER
if( gti.WidthToCreate < gti.WidthToLoad )
TRACE2("Check me, width to create = %d, width to load = %d", gti.WidthToCreate, gti.WidthToLoad);
if( gti.HeightToCreate < gti.HeightToLoad )
@ -1205,7 +1205,7 @@ uint32 ult = gfx->loadtile.tl/4;
uint32 lrs = gfx->loadtile.sh/4;
uint32 lrt = gfx->loadtile.th/4;
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwTLutFmt = (gRDP.otherModeH >> RSP_SETOTHERMODE_SHIFT_TEXTLUT)&0x3;
#endif
@ -1227,7 +1227,7 @@ tile.bSizeIsValid = true;
tile.lastTileCmd = CMD_LOADTLUT;
#ifdef _DEBUG
#ifdef DEBUGGER
/*
if((((gfx->words.w0)>>12)&0x3) != 0 || (((gfx->words.w0))&0x3) != 0 || (((gfx->words.w1)>>12)&0x3) != 0 || (((gfx->words.w1))&0x3) != 0)
TRACE0("Load tlut, sl,tl,sh,th are not integers");
@ -1697,7 +1697,7 @@ void DLParser_SetTileSize(Gfx *gfx)
tile.bSizeIsValid = true;
if( sl/4 > sh/4 || tl/4 > th/4 || (sh == 0 && tile.dwShiftS==0 && th == 0 && tile.dwShiftT ==0 ) )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( sl != 0 || tl != 0 || sh != 0 || th != 0 )
{
if( tile.dwMaskS==0 || tile.dwMaskT==0 )
@ -1761,7 +1761,7 @@ void DLParser_SetTImg(Gfx *gfx)
g_TI.dwAddr = RSPSegmentAddr((gfx->setimg.addr));
g_TI.bpl = g_TI.dwWidth << g_TI.dwSize >> 1;
#ifdef _DEBUG
#ifdef DEBUGGER
if( g_TI.dwAddr == 0x00ffffff)
{
TRACE0("Check me here in setTimg");
@ -2187,7 +2187,7 @@ void SetTmemFlag(uint32 tmemAddr, uint32 size)
uint32 index = tmemAddr>>5;
uint32 bitIndex = (tmemAddr&0x1F);
#ifdef _DEBUG
#ifdef DEBUGGER
if( size > 0x200 )
{
DebuggerAppendMsg("Check me: tmemaddr=%X, size=%x", tmemAddr, size);

28
src/RSP_GBI0.h
View file

@ -62,7 +62,7 @@ void RSP_GBI0_Mtx(Gfx *gfx)
CRender::g_pRender->SetWorldView(matToLoad, gfx->gbi0matrix.push, gfx->gbi0matrix.load);
}
#ifdef _DEBUG
#ifdef DEBUGGER
const char *loadstr = gfx->gbi0matrix.load == 1 ? "Load" : "Mul";
const char *pushstr = gfx->gbi0matrix.push == 1 ? "Push" : "Nopush";
int projlevel = CRender::g_pRender->GetProjectMatrixLevel();
@ -314,7 +314,7 @@ void RSP_GBI1_Line3D(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (gfx->words.cmd == (uint8)RSP_LINE3D && !(pauseAtNext && eventToPause==NEXT_FLUSH_TRI));
#else
} while (gfx->words.cmd == (uint8)RSP_LINE3D);
@ -335,7 +335,7 @@ void RSP_GBI1_ClearGeometryMode(Gfx *gfx)
SP_Timing(RSP_GBI1_ClearGeometryMode);
uint32 dwMask = ((gfx->words.w1));
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(" Mask=0x%08x", dwMask);
if (dwMask & G_ZBUFFER) LOG_UCODE(" Disabling ZBuffer");
if (dwMask & G_TEXTURE_ENABLE) LOG_UCODE(" Disabling Texture");
@ -361,7 +361,7 @@ void RSP_GBI1_SetGeometryMode(Gfx *gfx)
SP_Timing(RSP_GBI1_SetGeometryMode);
uint32 dwMask = ((gfx->words.w1));
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(" Mask=0x%08x", dwMask);
if (dwMask & G_ZBUFFER) LOG_UCODE(" Enabling ZBuffer");
if (dwMask & G_TEXTURE_ENABLE) LOG_UCODE(" Enabling Texture");
@ -374,7 +374,7 @@ void RSP_GBI1_SetGeometryMode(Gfx *gfx)
if (dwMask & G_TEXTURE_GEN) LOG_UCODE(" Enabling Texture Gen");
if (dwMask & G_TEXTURE_GEN_LINEAR) LOG_UCODE(" Enabling Texture Gen Linear");
if (dwMask & G_LOD) LOG_UCODE(" Enabling LOD (no impl)");
#endif // _DEBUG
#endif // DEBUGGER
gRDP.geometryMode |= dwMask;
RSP_GFX_InitGeometryMode();
}
@ -447,7 +447,7 @@ void RSP_GBI1_Texture(Gfx *gfx)
{
fTextureScaleS = 1/64.0f;
}
#ifdef _DEBUG
#ifdef DEBUGGER
else if( ((gfx->words.w1>>16)&0xFFFF) != 0 )
{
//DebuggerAppendMsg("Warning, texture scale = %08X is not integer", (word1>>16)&0xFFFF);
@ -462,7 +462,7 @@ void RSP_GBI1_Texture(Gfx *gfx)
{
fTextureScaleT = 1/64.0f;
}
#ifdef _DEBUG
#ifdef DEBUGGER
else if( (gfx->words.w1&0xFFFF) != 0 )
{
//DebuggerAppendMsg("Warning, texture scale = %08X is not integer", (word1)&0xFFFF);
@ -533,7 +533,7 @@ void RSP_GBI1_MoveWord(Gfx *gfx)
if( dwBase > g_dwRamSize )
{
gRSP.segments[dwSegment] = dwBase;
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
DebuggerAppendMsg("warning: Segment %d addr is %8X", dwSegment, dwBase);
#endif
@ -637,7 +637,7 @@ void RSP_GBI1_PopMtx(Gfx *gfx)
{
CRender::g_pRender->PopWorldView();
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_MATRIX_CMD )
{
pauseAtNext = false;
@ -660,7 +660,7 @@ void RSP_GBI1_CullDL(Gfx *gfx)
{
SP_Timing(RSP_GBI1_CullDL);
#ifdef _DEBUG
#ifdef DEBUGGER
if( !debuggerEnableCullFace )
{
return; //Disable Culling
@ -739,7 +739,7 @@ void RSP_GBI1_Tri1(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && gfx->words.cmd == (uint8)RSP_TRI1);
#else
} while (gfx->words.cmd == (uint8)RSP_TRI1);
@ -803,7 +803,7 @@ void RSP_GBI0_Tri4(Gfx *gfx)
w1 = *(uint32 *)(g_pRDRAMu8 + dwPC+4);
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && (w0>>24) == (uint8)RSP_TRI2);
#else
} while (((w0)>>24) == (uint8)RSP_TRI2);
@ -830,7 +830,7 @@ void RSP_RDP_Nothing(Gfx *gfx)
{
SP_Timing(RSP_RDP_Nothing);
#ifdef _DEBUG
#ifdef DEBUGGER
if( logWarning )
{
TRACE0("Stack Trace");
@ -893,7 +893,7 @@ void RSP_RDP_InsertMatrix(Gfx *gfx)
gRSP.bMatrixIsUpdated = false;
gRSP.bCombinedMatrixIsUpdated = true;
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_MATRIX_CMD )
{
pauseAtNext = false;

8
src/RSP_GBI1.h
View file

@ -137,7 +137,7 @@ void RSP_GBI1_Tri2(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && gfx->words.cmd == (uint8)RSP_TRI2);
#else
} while( gfx->words.cmd == (uint8)RSP_TRI2);
@ -164,7 +164,7 @@ void RSP_GBI1_BranchZ(Gfx *gfx)
uint32 vtx = ((gfx->words.w0)&0xFFF)>1;
float vtxdepth = g_vecProjected[vtx].z/g_vecProjected[vtx].w;
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerEnableZBuffer==FALSE || vtxdepth <= (s32)gfx->words.w1 || g_curRomInfo.bForceDepthBuffer )
#else
if( vtxdepth <= (s32)(gfx->words.w1) || g_curRomInfo.bForceDepthBuffer )
@ -182,7 +182,7 @@ void RSP_GBI1_BranchZ(Gfx *gfx)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
void DumpUcodeInfo(UcodeInfo &info)
{
DebuggerAppendMsg("Loading Unknown Ucode:\n%08X-%08X-%08X-%08X, Size=0x%X, CRC=0x%08X\nCode:\n",
@ -229,7 +229,7 @@ void RSP_GFX_Force_Matrix(uint32 dwAddr)
void DisplayVertexInfo(uint32 dwAddr, uint32 dwV0, uint32 dwN)
{
#ifdef _DEBUG
#ifdef DEBUGGER
s8 *pcSrc = (s8 *)(g_pRDRAMu8 + dwAddr);
short *psSrc = (short *)(g_pRDRAMu8 + dwAddr);

18
src/RSP_GBI2.h
View file

@ -58,7 +58,7 @@ void RSP_GBI2_CullDL(Gfx *gfx)
{
SP_Timing(RSP_GBI1_CullDL);
#ifdef _DEBUG
#ifdef DEBUGGER
if( !debuggerEnableCullFace )
{
return; //Disable Culling
@ -141,7 +141,7 @@ void RSP_GBI2_MoveWord(Gfx *gfx)
if( dwAddr > g_dwRamSize )
{
gRSP.segments[dwSeg] = dwAddr;
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
DebuggerAppendMsg("warning: Segment %d addr is %8X", dwSeg, dwAddr);
#endif
@ -270,7 +270,7 @@ void RSP_GBI2_Tri1(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && gfx->words.cmd == (uint8)RSP_ZELDATRI1);
#else
} while( gfx->words.cmd == (uint8)RSP_ZELDATRI1);
@ -356,7 +356,7 @@ void RSP_GBI2_Tri2(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && gfx->words.cmd == (uint8)RSP_ZELDATRI2);
#else
} while ( gfx->words.cmd == (uint8)RSP_ZELDATRI2 );//&& status.dwNumTrisRendered < 50);
@ -443,7 +443,7 @@ void RSP_GBI2_Line3D(Gfx *gfx)
gfx++;
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && gfx->words.cmd == (uint8)RSP_LINE3D);
#else
} while ( gfx->words.cmd == (uint8)RSP_LINE3D);
@ -548,7 +548,7 @@ void RSP_GBI2_PopMtx(Gfx *gfx)
{
CRender::g_pRender->PopWorldView();
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_MATRIX_CMD )
{
pauseAtNext = false;
@ -583,7 +583,7 @@ void RSP_GBI2_GeometryMode(Gfx *gfx)
uint32 dwAnd = ((gfx->words.w0)) & 0x00FFFFFF;
uint32 dwOr = ((gfx->words.w1)) & 0x00FFFFFF;
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(" 0x%08x 0x%08x =(x & 0x%08x) | 0x%08x", gfx->words.w0, gfx->words.w1, dwAnd, dwOr);
if ((~dwAnd) & RSP_ZELDA_ZBUFFER) LOG_UCODE(" Disabling ZBuffer");
@ -609,7 +609,7 @@ void RSP_GBI2_GeometryMode(Gfx *gfx)
if (dwOr & RSP_ZELDA_TEXTURE_GEN) LOG_UCODE(" Enabling Texture Gen");
if (dwOr & RSP_ZELDA_TEXTURE_GEN_LINEAR) LOG_UCODE(" Enabling Texture Gen Linear");
// if (dwOr & RSP_ZELDA_LOD) LOG_UCODE(" Enabling LOD (no impl)");
#endif // _DEBUG
#endif // DEBUGGER
gRDP.geometryMode &= dwAnd;
gRDP.geometryMode |= dwOr;
@ -693,7 +693,7 @@ void RSP_GBI2_Mtx(Gfx *gfx)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
const char *loadstr = gfx->gbi2matrix.load?"Load":"Mul";
const char *pushstr = gfx->gbi2matrix.nopush==0?"Push":"Nopush";
int projlevel = CRender::g_pRender->GetProjectMatrixLevel();

50
src/RSP_GBI_Others.h
View file

@ -237,7 +237,7 @@ void RSP_Vtx_Gemini(Gfx *gfx)
// DKR verts are extra 4 bytes
void RDP_GFX_DumpVtxInfoDKR(uint32 dwAddr, uint32 dwV0, uint32 dwN)
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwV;
int i;
@ -284,7 +284,7 @@ void RDP_GFX_DumpVtxInfoDKR(uint32 dwAddr, uint32 dwV0, uint32 dwN)
i += 5;
}
#endif // _DEBUG
#endif // DEBUGGER
}
void DLParser_Set_Addr_Ucode6(Gfx *gfx)
@ -419,7 +419,7 @@ void TexRectToN64FrameBuffer_YUV_16b(uint32 x0, uint32 y0, uint32 width, uint32
extern uObjMtxReal gObjMtxReal;
void DLParser_OgreBatter64BG(Gfx *gfx)
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwAddr = RSPSegmentAddr((gfx->words.w1));
uObjTxSprite *ptr = (uObjTxSprite*)(g_pRDRAMu8+dwAddr);
#endif
@ -429,7 +429,7 @@ PrepareTextures();
CTexture *ptexture = g_textures[0].m_pCTexture;
TexRectToN64FrameBuffer_16b( (uint32)gObjMtxReal.X, (uint32)gObjMtxReal.Y, ptexture->m_dwWidth, ptexture->m_dwHeight, gRSP.curTile);
#ifdef _DEBUG
#ifdef DEBUGGER
CRender::g_pRender->DrawSpriteR(*ptr, false);
DEBUGGER_PAUSE_AT_COND_AND_DUMP_COUNT_N((pauseAtNext &&
@ -668,7 +668,7 @@ void RSP_Tri4_PD(Gfx *gfx)
w1 = *(uint32 *)(g_pRDRAMu8 + dwPC+4);
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && (w0>>24) == (uint8)RSP_TRI2);
#else
} while ((w0>>24) == (uint8)RSP_TRI2);
@ -746,7 +746,7 @@ void DLParser_Tri4_Conker(Gfx *gfx)
w1 = *(uint32 *)(g_pRDRAMu8 + dwPC+4);
dwPC += 8;
#ifdef _DEBUG
#ifdef DEBUGGER
} while (!(pauseAtNext && eventToPause==NEXT_TRIANGLE) && (w0>>28) == 1 );
#else
} while ((w0>>28) == 1);
@ -916,7 +916,7 @@ void DLParser_RS_Color_Buffer(Gfx *gfx)
Rogue_Squadron_Vtx_Color_Addr = dwAddr;
LOG_UCODE("Vtx_Color at PC=%08X: 0x%08x 0x%08x\n", dwPC-8, (gfx->words.w0), (gfx->words.w1));
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && (eventToPause == NEXT_VERTEX_CMD ) )
{
DebuggerAppendMsg("Vtx_Color at PC=%08X: 0x%08x 0x%08x\n", dwPC-8, (gfx->words.w0), (gfx->words.w1));
@ -949,7 +949,7 @@ void DLParser_RS_Vtx_Buffer(Gfx *gfx)
Rogue_Squadron_Vtx_XYZ_Cmd = (gfx->words.w0);
Rogue_Squadron_Vtx_XYZ_Addr = dwAddr;
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && (eventToPause == NEXT_VERTEX_CMD ) )
{
DebuggerAppendMsg("Vtx_XYZ at PC=%08X: 0x%08x 0x%08x\n", dwPC-8, (gfx->words.w0), (gfx->words.w1));
@ -1021,7 +1021,7 @@ void DLParser_RS_0xbe(Gfx *gfx)
void DLParser_Ucode8_EndDL(Gfx *gfx)
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwPC = gDlistStack[gDlistStackPointer].pc-8;
#endif
@ -1031,7 +1031,7 @@ DEBUGGER_PAUSE_AND_DUMP(NEXT_DLIST, DebuggerAppendMsg("PC=%08X: EndDL, return to
void DLParser_Ucode8_DL(Gfx *gfx) // DL Function Call
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwPC = gDlistStack[gDlistStackPointer].pc-8;
#endif
@ -1087,7 +1087,7 @@ void DLParser_Ucode8_JUMP(Gfx *gfx) // DL Function Call
{
if( ((gfx->words.w0)&0x00FFFFFF) == 0 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwPC = gDlistStack[gDlistStackPointer].pc-8;
#endif
@ -1099,7 +1099,7 @@ if( ((gfx->words.w0)&0x00FFFFFF) == 0 )
dwAddr = (gfx->words.w1)&(g_dwRamSize-1);
}
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwCmd2 = *(uint32 *)(g_pRDRAMu8 + dwAddr);
uint32 dwCmd3 = *(uint32 *)(g_pRDRAMu8 + dwAddr+4);
#endif
@ -1214,7 +1214,7 @@ else
void DLParser_Ucode8_0xb4(Gfx *gfx)
{
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwPC = gDlistStack[gDlistStackPointer].pc;
#endif
@ -1226,7 +1226,7 @@ else if(((gfx->words.w0)&0xFFF) == 0x600)
DLParser_Unknown_Skip3(gfx);
else
{
#ifdef _DEBUG
#ifdef DEBUGGER
if(pauseAtNext)
{
DebuggerAppendMsg("ucode 0xb4 at PC=%08X: 0x%08x 0x%08x\n", dwPC-8,
@ -1258,7 +1258,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( GSBlkAddrSaves[gDlistStackPointer][0] == 0 || GSBlkAddrSaves[gDlistStackPointer][1] == 0 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, no next blk\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1270,7 +1270,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( ((dwCmd2>>24)!=0x80 && (dwCmd2>>24)!=0x00 ) || ((dwCmd3>>24)!=0x80 && (dwCmd3>>24)!=0x00 ) )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, Unknown\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1282,7 +1282,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( (dwCmd2>>24)!= (dwCmd3>>24) )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, Unknown\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1298,7 +1298,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( dwCmd2 < dwCmd3 )
{
// All right, the next block is not ucode, but data
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, next blk is data\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1315,7 +1315,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( (dwCmd4>>24) != 0x80 || (dwCmd5>>24) != 0x80 || (dwCmd6>>24) != 0x80 || (dwCmd7>>24) != 0x80 || dwCmd4 < dwCmd5 || dwCmd6 < dwCmd7 )
{
// All right, the next block is not ucode, but data
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, next blk is data\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1334,7 +1334,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
}
else if( (dwCmd2>>24)==0x00 && (dwCmd3>>24)==0x00 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, next blk is data\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1350,7 +1350,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
if( (dwCmd2>>24)==0x80 && (dwCmd3>>24)==0x80 && dwCmd2 < dwCmd3 )
{
// All right, the next block is not ucode, but data
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_DLIST)
{
DebuggerAppendMsg("PC=%08X: 0xB5 - %08X : %08X, %08X, EndDL, next blk is data\n", dwPC, (gfx->words.w1), dwCmd2, dwCmd3);
@ -1369,7 +1369,7 @@ void DLParser_Ucode8_0xb5(Gfx *gfx)
}
}
#ifdef _DEBUG
#ifdef DEBUGGER
uint32 dwAddr1 = RSPSegmentAddr(dwCmd2);
uint32 dwAddr2 = RSPSegmentAddr(dwCmd3);
@ -1486,7 +1486,7 @@ void PD_LoadMatrix_0xb4(uint32 addr)
}
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(
" %#+12.5f %#+12.5f %#+12.5f %#+12.5f\r\n"
" %#+12.5f %#+12.5f %#+12.5f %#+12.5f\r\n"
@ -1496,7 +1496,7 @@ void PD_LoadMatrix_0xb4(uint32 addr)
matToLoad.m[1][0], matToLoad.m[1][1], matToLoad.m[1][2], matToLoad.m[1][3],
matToLoad.m[2][0], matToLoad.m[2][1], matToLoad.m[2][2], matToLoad.m[2][3],
matToLoad.m[3][0], matToLoad.m[3][1], matToLoad.m[3][2], matToLoad.m[3][3]);
#endif // _DEBUG
#endif // DEBUGGER
}
void DLParser_RDPHalf_1_0xb4_GoldenEye(Gfx *gfx)
@ -1542,7 +1542,7 @@ void DLParser_RDPHalf_1_0xb4_GoldenEye(Gfx *gfx)
gDlistStack[gDlistStackPointer].pc += 312;
#ifdef _DEBUG
#ifdef DEBUGGER
if( logUcodes)
{
dwPC -= 8;

26
src/RSP_Parser.cpp
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "RenderTexture.h"
#include "Video.h"
#include "ucode.h"
#include <sys/time.h>
//#include <sys/time.h>
//////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////
@ -516,7 +516,7 @@ void RDP_SetUcodeMap(int ucode)
break;
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( logMicrocode )
TRACE1("Using ucode %d", ucode);
#endif
@ -607,7 +607,7 @@ static uint32 DLParser_IdentifyUcode( uint32 crc_size, uint32 crc_800, char* str
{
for ( uint32 i = 0; i < sizeof(g_UcodeData)/sizeof(UcodeData); i++ )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if ( crc_800 == g_UcodeData[i].crc_800 )
{
if( strlen(str)==0 || strcmp((const char *) g_UcodeData[i].ucode_name, str) == 0 )
@ -635,7 +635,7 @@ static uint32 DLParser_IdentifyUcode( uint32 crc_size, uint32 crc_800, char* str
#endif
}
#ifdef _DEBUG
#ifdef DEBUGGER
{
static bool warned = false;
if( warned == false )
@ -670,7 +670,7 @@ uint32 DLParser_CheckUcode(uint32 ucStart, uint32 ucDStart, uint32 ucSize, uint3
if( UsedUcodes[usedUcodeIndex].ucStart == ucStart && UsedUcodes[usedUcodeIndex].ucSize == ucSize &&
UsedUcodes[usedUcodeIndex].ucDStart == ucDStart /*&& UsedUcodes[usedUcodeIndex].ucDSize == ucDSize*/ )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if(gRSP.ucode != (int)UsedUcodes[usedUcodeIndex].ucode && logMicrocode)
{
DebuggerAppendMsg("Check, ucode = %d, crc = %08X, %s", UsedUcodes[usedUcodeIndex].ucode,
@ -719,7 +719,7 @@ uint32 DLParser_CheckUcode(uint32 ucStart, uint32 ucDStart, uint32 ucSize, uint3
ucode = DLParser_IdentifyUcode( crc_size, crc_800, (char*)str );
if ( (int)ucode == ~0 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
static bool warned=false;
//if( warned == false )
{
@ -741,7 +741,7 @@ uint32 DLParser_CheckUcode(uint32 ucStart, uint32 ucDStart, uint32 ucSize, uint3
//DLParser_SetuCode( ucode );
#ifdef _DEBUG
#ifdef DEBUGGER
{
static bool warned=false;
if( warned == false )
@ -867,7 +867,7 @@ void DLParser_Process(OSTask * pTask)
// The main loop
while( gDlistStackPointer >= 0 )
{
#ifdef _DEBUG
#ifdef DEBUGGER
DEBUGGER_PAUSE_COUNT_N(NEXT_UCODE);
if( debuggerPause )
{
@ -885,7 +885,7 @@ void DLParser_Process(OSTask * pTask)
status.gUcodeCount++;
Gfx *pgfx = (Gfx*)&g_pRDRAMu32[(gDlistStack[gDlistStackPointer].pc>>2)];
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE("0x%08x: %08x %08x %-10s",
gDlistStack[gDlistStackPointer].pc, pgfx->words.w0, pgfx->words.w1, (gRSP.ucode!=5&&gRSP.ucode!=10)?ucodeNames_GBI1[(pgfx->words.w0>>24)]:ucodeNames_GBI2[(pgfx->words.w0>>24)]);
#endif
@ -921,7 +921,7 @@ void DLParser_Process(OSTask * pTask)
void RDP_NOIMPL_Real(const char* op, uint32 word0, uint32 word1)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( logWarning )
{
TRACE0("Stack Trace");
@ -939,7 +939,7 @@ void RDP_NOIMPL_Real(const char* op, uint32 word0, uint32 word1)
void RDP_NOIMPL_WARN(const char* op)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if(logWarning)
{
TRACE0(op);
@ -1777,7 +1777,7 @@ void LoadMatrix(uint32 addr)
}
#ifdef _DEBUG
#ifdef DEBUGGER
LOG_UCODE(
" %#+12.5f %#+12.5f %#+12.5f %#+12.5f\r\n"
" %#+12.5f %#+12.5f %#+12.5f %#+12.5f\r\n"
@ -1787,6 +1787,6 @@ void LoadMatrix(uint32 addr)
matToLoad.m[1][0], matToLoad.m[1][1], matToLoad.m[1][2], matToLoad.m[1][3],
matToLoad.m[2][0], matToLoad.m[2][1], matToLoad.m[2][2], matToLoad.m[2][3],
matToLoad.m[3][0], matToLoad.m[3][1], matToLoad.m[3][2], matToLoad.m[3][3]);
#endif // _DEBUG
#endif // DEBUGGER
}

2
src/RSP_Parser.h
View file

@ -620,7 +620,7 @@ uint32 DLParser_CheckUcode(uint32 ucStart, uint32 ucDStart, uint32 ucSize, uint3
bool IsUsedAsDI(uint32 addr);
#if defined(_DEBUG)
#if defined(DEBUGGER)
void __cdecl LOG_UCODE(const char* szFormat, ...);
#else
inline void LOG_UCODE(...) {}

10
src/RSP_S2DEX.cpp
View file

@ -73,7 +73,7 @@ void RSP_S2DEX_OBJ_RECTANGLE(Gfx *gfx)
}
CRender::g_pRender->DrawSprite(objtx, false);
#ifdef _DEBUG
#ifdef DEBUGGER
if( (pauseAtNext && (eventToPause == NEXT_OBJ_TXT_CMD||eventToPause == NEXT_FLUSH_TRI)) || logTextures )
{
if( debuggerPauseCount > 0 )
@ -120,7 +120,7 @@ void RSP_S2DEX_OBJ_SPRITE(Gfx *gfx)
}
*/
#ifdef _DEBUG
#ifdef DEBUGGER
if( (pauseAtNext && (eventToPause == NEXT_OBJ_TXT_CMD||eventToPause == NEXT_FLUSH_TRI)) || logTextures )
{
eventToPause = false;
@ -179,7 +179,7 @@ void RSP_S2DEX_OBJ_RENDERMODE_2(Gfx *gfx)
RSP_S2DEX_OBJ_RENDERMODE(gfx);
}
#ifdef _DEBUG
#ifdef DEBUGGER
void DumpBlockParameters(uObjTxtrBlock &ptr)
{
/*
@ -485,7 +485,7 @@ void RSP_S2DEX_OBJ_MOVEMEM(Gfx *gfx)
gObjMtxReal.BaseScaleX = gObjMtx->BaseScaleX/1024.0f;
gObjMtxReal.BaseScaleY = gObjMtx->BaseScaleY/1024.0f;
#ifdef _DEBUG
#ifdef DEBUGGER
DumpObjMtx();
#endif
}
@ -497,7 +497,7 @@ void RSP_S2DEX_OBJ_MOVEMEM(Gfx *gfx)
gObjMtxReal.BaseScaleX = gSubObjMtx->BaseScaleX/1024.0f;
gObjMtxReal.BaseScaleY = gSubObjMtx->BaseScaleY/1024.0f;
#ifdef _DEBUG
#ifdef DEBUGGER
DumpObjMtx(false);
#endif
}

11
src/Render.cpp
View file

@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "osal_preproc.h"
#include "m64p_plugin.h"
#include "ConvertImage.h"
@ -34,6 +35,10 @@ XMATRIX reverseXY(-1,0,0,0,0,-1,0,0,0,0,1,0,0,0,0,1);
XMATRIX reverseY(1,0,0,0,0,-1,0,0,0,0,1,0,0,0,0,1);
extern char* right (char * src, int nchars);
#if defined(WIN32)
#define strcasecmp _stricmp
#endif
//========================================================================
CRender * CRender::GetRender(void)
{
@ -246,7 +251,7 @@ void CRender::PopWorldView()
}
else
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
TRACE0("Popping past worldview stack limits");
#endif
@ -262,7 +267,7 @@ Matrix & CRender::GetWorldProjectMatrix(void)
void CRender::SetWorldProjectMatrix(Matrix &mtx)
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && (eventToPause == NEXT_TRIANGLE || eventToPause == NEXT_FLUSH_TRI || eventToPause == NEXT_MATRIX_CMD ) )
{
uint32 dwPC = gDlistStack[gDlistStackPointer].pc-8;
@ -1568,7 +1573,7 @@ void CRender::SaveTextureToFile(CTexture &texture, char *filename, TextureChanne
}
#ifdef _DEBUG
#ifdef DEBUGGER
bool CRender::DrawTexture(int tex, TextureChannel channel)
{
if( g_textures[tex].m_pCTexture == NULL )

2
src/Render.h
View file

@ -196,7 +196,7 @@ public:
virtual void SetFillMode(FillMode mode)=0;
#ifdef _DEBUG
#ifdef DEBUGGER
virtual bool DrawTexture(int tex, TextureChannel channel = TXT_RGB );
virtual void SaveTextureToFile(int tex, TextureChannel channel = TXT_RGB, bool bShow = false);
#endif

42
src/RenderBase.cpp
View file

@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <cmath>
#include <vector>
#include "osal_preproc.h"
#include "float.h"
#include "DeviceBuilder.h"
#include "VertexShaderConstantDef.h"
@ -108,15 +109,15 @@ inline void RSP_Vtx_Clipping(int i) {}
/*
* Global variables
*/
RSP_Options gRSP __attribute__((aligned(16)));
RDP_Options gRDP __attribute__((aligned(16)));
ALIGN(16,RSP_Options gRSP)
ALIGN(16,RDP_Options gRDP)
static XVECTOR4 g_normal __attribute__((aligned(16)));
static ALIGN(16,XVECTOR4 g_normal)
//static int norms[3];
XVECTOR4 g_vtxNonTransformed[MAX_VERTS] __attribute__((aligned(16)));
XVECTOR4 g_vecProjected[MAX_VERTS] __attribute__((aligned(16)));
XVECTOR4 g_vtxTransformed[MAX_VERTS] __attribute__((aligned(16)));
ALIGN(16,XVECTOR4 g_vtxNonTransformed[MAX_VERTS])
ALIGN(16,XVECTOR4 g_vecProjected[MAX_VERTS])
ALIGN(16,XVECTOR4 g_vtxTransformed[MAX_VERTS])
float g_vtxProjected5[1000][5];
float g_vtxProjected5Clipped[2000][5];
@ -145,11 +146,12 @@ float gRSPfFogDivider;
uint32 gRSPnumLights;
Light gRSPlights[16];
Matrix gRSPworldProjectTransported __attribute__((aligned(16)));
Matrix gRSPworldProject __attribute__((aligned(16)));
Matrix gRSPmodelViewTop __attribute__((aligned(16)));
Matrix gRSPmodelViewTopTranspose __attribute__((aligned(16)));
Matrix dkrMatrixTransposed __attribute__((aligned(16)));
ALIGN(16,Matrix gRSPworldProjectTransported)
ALIGN(16,Matrix gRSPworldProject)
ALIGN(16,Matrix gRSPmodelViewTop)
ALIGN(16,Matrix gRSPmodelViewTopTranspose)
ALIGN(16,Matrix dkrMatrixTransposed)
N64Light gRSPn64lights[16];
@ -251,7 +253,7 @@ __asm l3: \
#endif
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__declspec( naked ) void __fastcall SSEVec3Transform(int i)
{
__asm
@ -479,7 +481,7 @@ void SSEVec3Transform(int i)
float real255 = 255.0f;
float real128 = 128.0f;
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__declspec( naked ) void __fastcall SSEVec3TransformNormal()
{
__asm
@ -528,7 +530,7 @@ __declspec( naked ) void __fastcall SSEVec3TransformNormal()
mulss xmm0,xmm0;
addss xmm7,xmm0; // xmm7 1st uint32 is the sum of squares
#ifdef _DEBUG
#ifdef DEBUGGER
movaps DWORD PTR [g_normal], xmm4;
movss DWORD PTR [g_normal][12], xmm7;
#endif
@ -538,7 +540,7 @@ __declspec( naked ) void __fastcall SSEVec3TransformNormal()
rsqrtss xmm7,xmm7;
shufps xmm7,xmm7,0;
#ifdef _DEBUG
#ifdef DEBUGGER
movss DWORD PTR [g_normal][12], xmm7;
#endif
mulps xmm4,xmm7;
@ -589,7 +591,7 @@ void SSEVec3TransformNormal(void)
" movlhps %%xmm0, %%xmm4 \n"
" mulss %%xmm0, %%xmm0 \n"
" addss %%xmm0, %%xmm7 \n"
#ifdef _DEBUG
#ifdef DEBUGGER
" movaps %%xmm4, (%0) \n"
" movss %%xmm7, 12(%0) \n"
#endif
@ -598,7 +600,7 @@ void SSEVec3TransformNormal(void)
" jz 0f \n"
" rsqrtss %%xmm7, %%xmm7 \n"
" shufps $0x00, %%xmm7, %%xmm7 \n"
#ifdef _DEBUG
#ifdef DEBUGGER
" movss %%xmm7, 12(%0) \n"
#endif
" mulps %%xmm7, %%xmm4 \n"
@ -1113,7 +1115,7 @@ float zero = 0.0f;
float onef = 1.0f;
float fcosT;
#if defined(__INTEL_COMPILER) && !defined(NO_ASM)
#if !defined(__GNUC__) && !defined(NO_ASM)
__declspec( naked ) uint32 __fastcall SSELightVert()
{
__asm
@ -1562,7 +1564,7 @@ bool IsTriangleVisible(uint32 dwV0, uint32 dwV1, uint32 dwV2)
DEBUGGER_ONLY_IF( (!debuggerEnableTestTris || !debuggerEnableCullFace), {return TRUE;});
#ifdef _DEBUG
#ifdef DEBUGGER
// Check vertices are valid!
if (dwV0 >= MAX_VERTS || dwV1 >= MAX_VERTS || dwV2 >= MAX_VERTS)
return false;
@ -1651,7 +1653,7 @@ void SetPrimitiveDepth(uint32 z, uint32 dwDZ)
//how to use dwDZ?
#ifdef _DEBUG
#ifdef DEBUGGER
if( (pauseAtNext && (eventToPause == NEXT_VERTEX_CMD || eventToPause == NEXT_FLUSH_TRI )) )//&& logTriangles )
{
DebuggerAppendMsg("Set prim Depth: %f, (%08X, %08X)", gRDP.fPrimitiveDepth, z, dwDZ);

4
src/RenderExt.cpp
View file

@ -104,7 +104,7 @@ void CRender::LoadFrameBuffer(bool useVIreg, uint32 left, uint32 top, uint32 wid
return;
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext )
{
DebuggerAppendMsg("Load Frame Buffer Imag at: %08X, (%d, %d) - (%d, %d)", gti.Address,
@ -492,7 +492,7 @@ void CRender::DrawFrameBuffer(bool useVIreg, uint32 left, uint32 top, uint32 wid
}
TXTRBUF_OR_CI_DUMP(TRACE0("Draw Frame Buffer Img"));
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && ( eventToPause == NEXT_FRAME || eventToPause == NEXT_FLUSH_TRI ) )
{
TRACE0("Draw Frame Buffer Img");

2
src/TextureFilters.cpp
View file

@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "liblinux/BMGLibPNG.h"
#include "liblinux/BMGDLL.h"
#include <sys/types.h>
#include <dirent.h>
//#include <dirent.h>
#include <sys/stat.h>
#include <limits.h> // PATH_MAX

12
src/TextureManager.cpp
View file

@ -791,7 +791,7 @@ TxtrCacheEntry * CTextureManager::GetTexture(TxtrInfo * pgti, bool fromTMEM, boo
DumpCachedTexture(*pEntry);
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( pauseAtNext && eventToPause == NEXT_NEW_TEXTURE )
{
CRender::g_pRender->SetCurrentTexture( 0, pEntry->pTexture, pEntry->ti.WidthToCreate, pEntry->ti.HeightToCreate, pEntry);
@ -925,7 +925,7 @@ void CTextureManager::ExpandTexture(TxtrCacheEntry * pEntry, uint32 sizeToLoad,
uint32 maskWidth = (1<<mask);
int size = pEntry->pTexture->GetPixelSize();
#ifdef _DEBUG
#ifdef DEBUGGER
// Some checks
if( sizeToLoad > sizeToCreate || sizeToCreate > sizeCreated )
TRACE0("Something is wrong, check me here in ExpandTextureS");
@ -952,7 +952,7 @@ void CTextureManager::ExpandTexture(TxtrCacheEntry * pEntry, uint32 sizeToLoad,
return;
}
#ifdef _DEBUG
#ifdef DEBUGGER
if( sizeToLoad > maskWidth )
{
TRACE0("Something is wrong, check me here in ExpandTextureS");
@ -1003,7 +1003,7 @@ void CTextureManager::ExpandTexture(TxtrCacheEntry * pEntry, uint32 sizeToLoad,
if( sizeToLoad == sizeToCreate && sizeToCreate < maskWidth )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( maskWidth < sizeToCreate ) TRACE0("Incorrect condition, check me");
#endif
Clamp(di.lpSurface, sizeToLoad, sizeCreated, arrayWidth, otherSize, flag, size );
@ -1014,7 +1014,7 @@ void CTextureManager::ExpandTexture(TxtrCacheEntry * pEntry, uint32 sizeToLoad,
if( sizeToLoad < sizeToCreate && sizeToCreate < maskWidth )
{
#ifdef _DEBUG
#ifdef DEBUGGER
if( clamp ) TRACE0("Incorrect condition, check me");
if( maskWidth < sizeCreated ) TRACE0("Incorrect condition, check me");
#endif
@ -1307,7 +1307,7 @@ void CTextureManager::Mirror(void *array, uint32 width, uint32 mask, uint32 towi
}
#ifdef _DEBUG
#ifdef DEBUGGER
TxtrCacheEntry * CTextureManager::GetCachedTexture(uint32 tex)
{
uint32 size = 0;

2
src/TextureManager.h
View file

@ -244,7 +244,7 @@ public:
void RecheckHiresForAllTextures();
bool CleanUp();
#ifdef _DEBUG
#ifdef DEBUGGER
TxtrCacheEntry * GetCachedTexture(uint32 tex);
uint32 GetNumOfCachedTexture();
#endif

2
src/Video.cpp
View file

@ -677,7 +677,7 @@ EXPORT void CALL RomOpen(void)
g_dwRamSize = 0x800000;
#ifdef _DEBUG
#ifdef DEBUGGER
if( debuggerPause )
{
debuggerPause = FALSE;

2
src/liblinux/BMGImage.h
View file

@ -26,7 +26,7 @@
// POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "../osal_win32types.h"
#include "../osal_preproc.h"
#if !defined(WIN32)
typedef struct tagRGBQUAD

2
src/liblinux/BMGUtils.h
View file

@ -9,7 +9,7 @@
*/
#include "BMGImage.h"
#include "../osal_win32types.h"
#include "../osal_preproc.h"
/* the following 3 functions are used to access the background color
// and the background image */

74
src/osal_dynamiclib_win32.c Normal file
View file

@ -0,0 +1,74 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Mupen64plus-ui-console - osal_dynamiclib_win32.c *
* Mupen64Plus homepage: http://code.google.com/p/mupen64plus/ *
* Copyright (C) 2009 Richard Goedeken *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <windows.h>
#include <stdlib.h>
#include <stdio.h>
#include "m64p_types.h"
#include "osal_dynamiclib.h"
m64p_error osal_dynlib_open(m64p_dynlib_handle *pLibHandle, const char *pccLibraryPath)
{
if (pLibHandle == NULL || pccLibraryPath == NULL)
return M64ERR_INPUT_ASSERT;
*pLibHandle = LoadLibrary(pccLibraryPath);
if (*pLibHandle == NULL)
{
char *pchErrMsg;
DWORD dwErr = GetLastError();
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL);
fprintf(stderr, "LoadLibrary('%s') error: %s\n", pccLibraryPath, pchErrMsg);
LocalFree(pchErrMsg);
return M64ERR_INPUT_NOT_FOUND;
}
return M64ERR_SUCCESS;
}
void * osal_dynlib_getproc(m64p_dynlib_handle LibHandle, const char *pccProcedureName)
{
if (pccProcedureName == NULL)
return NULL;
return GetProcAddress(LibHandle, pccProcedureName);
}
m64p_error osal_dynlib_close(m64p_dynlib_handle LibHandle)
{
int rval = FreeLibrary(LibHandle);
if (rval == 0)
{
char *pchErrMsg;
DWORD dwErr = GetLastError();
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL);
fprintf(stderr, "FreeLibrary() error: %s\n", pchErrMsg);
LocalFree(pchErrMsg);
return M64ERR_INTERNAL;
}
return M64ERR_SUCCESS;
}

30
src/osal_win32types.h → src/osal_preproc.h
View file

@ -1,5 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Mupen64plus - osal_win32types.h *
* Mupen64plus - osal_preproc.h *
* Mupen64Plus homepage: http://code.google.com/p/mupen64plus/ *
* Copyright (C) 2009 Richard Goedeken *
* Copyright (C) 2002 Hacktarux *
@ -20,10 +20,19 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* this header file is for system-dependent #defines, #includes, and typedefs */
#if !defined(OSAL_PREPROC_H)
#define OSAL_PREPROC_H
#if defined(WIN32)
#include <windows.h>
#elif !defined(WIN32TYPES_H)
#define WIN32TYPES_H
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#define ALIGN(BYTES,DATA) __declspec(align(BYTES)) DATA;
#else
#define ALIGN(BYTES,DATA) DATA __attribute__((aligned(BYTES)));
typedef unsigned int BOOL;
typedef void* HBITMAP;
@ -36,12 +45,6 @@ typedef struct
int left;
} RECT;
typedef struct _COORDRECT
{
int x1,y1;
int x2,y2;
} COORDRECT;
#define __cdecl
#ifndef FALSE
@ -52,12 +55,6 @@ typedef struct _COORDRECT
#define TRUE 1
#endif
typedef unsigned int COLOR;
#define SURFFMT_A8R8G8B8 21
#define COLOR_RGBA(r,g,b,a) (((r&0xFF)<<16) | ((g&0xFF)<<8) | ((b&0xFF)<<0) | ((a&0xFF)<<24))
typedef struct tagBITMAPINFOHEADER
{
unsigned int biSize;
@ -90,5 +87,6 @@ typedef struct tagBITMAPFILEHEADER
#define BI_RGB 0
#endif // WIN32TYPES_H
#endif // WIN32
#endif // OSAL_PREPROC_H

11
src/typedefs.h
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _TYPEDEFS_H_
#define _TYPEDEFS_H_
#include "osal_win32types.h"
#include "osal_preproc.h"
#include "VectorMath.h"
#define uchar unsigned char
@ -35,8 +35,15 @@ typedef int s32;
typedef unsigned int u32;
typedef unsigned char u8;
typedef unsigned int COLOR;
typedef struct _COORDRECT
{
int x1,y1;
int x2,y2;
} COORDRECT;
#define COLOR_RGBA(r,g,b,a) (((r&0xFF)<<16) | ((g&0xFF)<<8) | ((b&0xFF)<<0) | ((a&0xFF)<<24))
#define SURFFMT_A8R8G8B8 21
//Fix me, these macro should not be used anymore in DirectX 8
#define RGBA_GETALPHA(rgb) ((rgb) >> 24)
#define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff)
#define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff)

2
src/ucode.h
View file

@ -168,7 +168,7 @@ UcodeFunc(RDP_TriShadeZ);
UcodeFunc(RDP_TriShadeTxtr);
UcodeFunc(RDP_TriShadeTxtrZ);
#ifdef _DEBUG
#ifdef DEBUGGER
const char* ucodeNames_GBI1[256] =
{
"RSP_SPNOOP", "RSP_MTX", "Reserved0", "RSP_MOVEMEM",