Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deleting some spaces #1088

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Cafe/Account/Account.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ std::vector<Account> Account::s_account_list;
Account::Account(uint32 persistent_id)
: m_persistent_id(persistent_id) {}


typedef struct
{
uint32be high;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/CafeSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@ namespace CafeSystem

GameInfo2 sGameInfo_ForegroundTitle;


static void _CheckForWine()
{
#if BOOST_OS_WINDOWS
Expand Down
6 changes: 0 additions & 6 deletions src/Cafe/Filesystem/FST/fstUtil.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,3 @@ static void FSTPathUnitTest()
cemu_assert_debug(p7.MatchNodeName(1, "content"));
cemu_assert_debug(p7.MatchNodeName(2, ".."));
}






1 change: 0 additions & 1 deletion src/Cafe/Filesystem/fsc.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ class fscDeviceC

};


struct FSCVirtualFile
{
struct FSCDirIteratorState
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/GamePatch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ static_assert(sizeof(bayo2_audioQueueFixSignature) == sizeof(bayo2_audioQueueFix

uint8 cars3_avro_schema_incref[] = { 0x2C,0x03,0x00,0x00,0x94,0x21,0xFF,0xE8,0x41,0x82,0x00,0x40,0x39,0x03,0x00,0x08,0x39,0x41,0x00,0x08,0x91,0x01,0x00,0x08,0x7D,0x80,0x50,0x28,0x2C,0x0C,0xFF,0xFF,0x41,0x82,0x00,0x28,0x39,0x21,0x00,0x0C,0x38,0x0C,0x00,0x01,0x38,0xE0,0x00,0x01,0x91,0x01,0x00,0x0C,0x7C,0x00,0x49,0x2D };


sint32 hleIndex_h000000001 = -1;
sint32 hleIndex_h000000002 = -1;
sint32 hleIndex_h000000003 = -1;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/GameProfile/GameProfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ bool gameProfile_loadBooleanOption(IniParser* iniParser, char* optionName, gameP
return false;
}


bool gameProfile_loadBooleanOption2(IniParser& iniParser, const char* optionName, bool& option)
{
auto option_value = iniParser.FindOption(optionName);
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/GraphicPack/GraphicPack2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,6 @@ RendererOutputShader* GraphicPack2::GetDownscalingShader(bool render_upside_down
}
}


std::vector<GraphicPack2::PresetPtr> GraphicPack2::GetActivePresets() const
{
std::vector<PresetPtr> result;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/GraphicPack/GraphicPackError.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class PatchErrorHandler
APPLY,
};


void setCurrentGraphicPack(class GraphicPack2* gp)
{
m_gp = gp;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/AI/AI.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "Cafe/HW/MMU/MMU.h"


namespace HW_AI
{

Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Debugger/DebugSymbolStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ enum class DEBUG_SYMBOL_TYPE
DOUBLE,
};


class DebugSymbolStorage
{
public:
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Espresso/Debugger/Debugger.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#define DEBUGGER_BP_T_GDBSTUB_TW 0x7C010008
#define DEBUGGER_BP_T_DEBUGGER_TW 0x7C020008


struct DebuggerBreakpoint
{
uint32 address;
Expand All @@ -31,7 +30,6 @@ struct DebuggerBreakpoint
next = nullptr;
}


bool operator<(const DebuggerBreakpoint& rhs) const
{
return address < rhs.address;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Interpreter/PPCInterpreterALU.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -922,4 +922,3 @@ static void PPCInterpreter_CMPLI(PPCInterpreter_t* hCPU, uint32 opcode)
hCPU->cr[cr * 4 + CR_BIT_SO] = 1;
PPCInterpreter_nextInstruction(hCPU);
}

1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Interpreter/PPCInterpreterHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ static uint32 ppc_cmp_and_mask[8] = {
0x0fffffff,
};


#define ppc_word_rotl(_data, _n) (std::rotl<uint32>(_data,(_n)&0x1F))

static inline uint32 ppc_mask(int MB, int ME)
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Espresso/Interpreter/PPCInterpreterLoadStore.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ static void PPCInterpreter_STFSUX(PPCInterpreter_t* hCPU, uint32 Opcode)
hCPU->gpr[rA] += hCPU->gpr[rB];
}


static void PPCInterpreter_STFD(PPCInterpreter_t* hCPU, uint32 Opcode)
{
FPUCheckAvailable();
Expand Down Expand Up @@ -861,7 +860,6 @@ static void PPCInterpreter_PSQ_STU(PPCInterpreter_t* hCPU, unsigned int opcode)
PPCInterpreter_nextInstruction(hCPU);
}


static void PPCInterpreter_PSQ_STX(PPCInterpreter_t* hCPU, unsigned int opcode)
{
FPUCheckAvailable();
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Interpreter/PPCInterpreterOPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ void PPCInterpreter_BX(PPCInterpreter_t* hCPU, uint32 Opcode)
PPCInterpreter_jumpToInstruction(hCPU, li);
}


void PPCInterpreter_BCX(PPCInterpreter_t* hCPU, uint32 Opcode)
{
uint32 BO, BI, BD;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Interpreter/PPCInterpreterPS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ void PPCInterpreter_PS_DIV(PPCInterpreter_t* hCPU, uint32 Opcode)
PPCInterpreter_nextInstruction(hCPU);
}


void PPCInterpreter_PS_MADD(PPCInterpreter_t* hCPU, uint32 Opcode)
{
FPUCheckAvailable();
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Espresso/Interpreter/PPCInterpreterSPR.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,6 @@ static uint32 PPCSpr_get(PPCInterpreter_t* hCPU, uint32 spr)
break;
}



//if( spr == SPR_LR || spr == SPR_PVR || spr == SPR_UPIR || spr == SPR_SCR || (spr >= SPR_UGQR0 && spr <= SPR_UGQR7) )
//{
// // readable registers
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ bool PPCRecompiler_makeRecompiledFunctionActive(uint32 initialEntryPoint, PPCFun
ppcRecompilerInstanceData->ppcRecompilerDirectJumpTable[itr.first / 4] = (PPCREC_JUMP_ENTRY)((uint8*)ppcRecFunc->x86Code + itr.second);
}


// due to inlining, some entrypoints can get optimized away
// therefore we reset all addresses that are still marked as visited (but not recompiled)
// we dont remove the points from the queue but any address thats not marked as visited won't get recompiled
Expand Down
3 changes: 0 additions & 3 deletions src/Cafe/HW/Espresso/Recompiler/PPCRecompilerIml.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,6 @@ void PPCRecompilerImlGen_generateNewInstruction_r_s32(ppcImlGenContext_t* ppcIml
void PPCRecompilerImlGen_generateNewInstruction_conditional_r_s32(ppcImlGenContext_t* ppcImlGenContext, PPCRecImlInstruction_t* imlInstruction, uint32 operation, uint8 registerIndex, sint32 immS32, uint32 crRegisterIndex, uint32 crBitIndex, bool bitMustBeSet);
void PPCRecompilerImlGen_generateNewInstruction_r_r(ppcImlGenContext_t* ppcImlGenContext, PPCRecImlInstruction_t* imlInstruction, uint32 operation, uint8 registerResult, uint8 registerA, uint8 crRegister = PPC_REC_INVALID_REGISTER, uint8 crMode = 0);



// IML instruction generation (new style, can generate new instructions but also overwrite existing ones)

void PPCRecompilerImlGen_generateNewInstruction_noOp(ppcImlGenContext_t* ppcImlGenContext, PPCRecImlInstruction_t* imlInstruction);
Expand Down Expand Up @@ -389,7 +387,6 @@ void PPCRecompiler_reorderConditionModifyInstructions(ppcImlGenContext_t* ppcIml

void PPCRecompiler_dumpIMLSegment(PPCRecImlSegment_t* imlSegment, sint32 segmentIndex, bool printLivenessRangeInfo = false);


typedef struct
{
union
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Espresso/Recompiler/PPCRecompilerImlGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ void PPCRecompilerImlGen_generateNewInstruction_conditional_r_s32(ppcImlGenConte
imlInstruction->op_conditional_r_s32.bitMustBeSet = bitMustBeSet;
}


void PPCRecompilerImlGen_generateNewInstruction_jump(ppcImlGenContext_t* ppcImlGenContext, PPCRecImlInstruction_t* imlInstruction, uint32 jumpmarkAddress)
{
// jump
Expand Down Expand Up @@ -2774,7 +2773,6 @@ bool PPCRecompilerImlGen_XOR(ppcImlGenContext_t* ppcImlGenContext, uint32 opcode
return true;
}


bool PPCRecompilerImlGen_EQV(ppcImlGenContext_t* ppcImlGenContext, uint32 opcode)
{
sint32 rS, rA, rB;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Recompiler/PPCRecompilerImlGenFPU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ bool PPCRecompilerImlGen_STFSX(ppcImlGenContext_t* ppcImlGenContext, uint32 opco
return true;
}


bool PPCRecompilerImlGen_STFSUX(ppcImlGenContext_t* ppcImlGenContext, uint32 opcode)
{
sint32 rA, frS, rB;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,6 @@ bool PPCRecompiler_manageFPRRegisters(ppcImlGenContext_t* ppcImlGenContext)
return true;
}


/*
* Returns true if the loaded value is guaranteed to be overwritten
*/
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Recompiler/PPCRecompilerX64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2181,7 +2181,6 @@ bool PPCRecompilerX64Gen_imlInstruction_cr(PPCRecFunction_t* PPCRecFunction, ppc
return false;
}


void PPCRecompilerX64Gen_imlInstruction_ppcEnter(PPCRecFunction_t* PPCRecFunction, ppcImlGenContext_t* ppcImlGenContext, x64GenContext_t* x64GenContext, PPCRecImlInstruction_t* imlInstruction)
{
imlInstruction->op_ppcEnter.x64Offset = x64GenContext->codeBufferIndex;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Recompiler/PPCRecompilerX64Gen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1779,7 +1779,6 @@ void x64Gen_jmpc_far(x64GenContext_t* x64GenContext, sint32 conditionType, sint3
x64Gen_writeU32(x64GenContext, (uint32)relativeDest);
}


void x64Gen_jmpc_near(x64GenContext_t* x64GenContext, sint32 conditionType, sint32 relativeDest)
{
// near JMPc #+relativeDest
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Espresso/Recompiler/x64Emit.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@


template<uint8 op0, bool rex64Bit = false>
class x64_opc_1byte
{
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/FetchShader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::Cach
newFetchShader->m_isRegistered = true;
}


return newFetchShader;
}

Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/FetchShader.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ struct LatteFetchShader
CacheHash m_cacheHash{};
bool m_isRegistered{}; // if true, fetch shader is referenced by cache (RegisterInCache() succeeded)


void CalculateFetchShaderVkHash();

uint64 getVkPipelineHashFragment() const { return vkPipelineHashFragment; };
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/LatteCommandProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ LatteCMDPtr LatteCP_itMemWrite(LatteCMDPtr cmd, uint32 nWords)
return cmd;
}


LatteCMDPtr LatteCP_itMemSemaphore(LatteCMDPtr cmd, uint32 nWords)
{
cemu_assert_debug(nWords == 2);
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/LatteDefaultShaders.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ LatteDefaultShader_t* LatteDefaultShader_getPixelCopyShader_colorToDepth()
fCStr_defaultFragShader.add("gl_FragDepth = texture(textureSrc, passUV).r;\r\n");
fCStr_defaultFragShader.add("}\r\n");


defaultShader->glProgamId = gxShaderDepr_compileRaw(&fCStr_vertexShader, &fCStr_defaultFragShader);
defaultShader->copyShaderUniforms.uniformLoc_textureSrc = glGetUniformLocation(defaultShader->glProgamId, "textureSrc");
defaultShader->copyShaderUniforms.uniformLoc_vertexOffsets = glGetUniformLocation(defaultShader->glProgamId, "uf_vertexOffsets");
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/LatteIndices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ void LatteIndices_generateAutoQuadStripIndices(void* indexDataOutput, uint32 cou
indexMax = std::max(count, 1u) - 1;
}


template<typename T>
void LatteIndices_generateAutoLineLoopIndices(void* indexDataOutput, uint32 count, uint32& indexMin, uint32& indexMax)
{
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,6 @@ void LatteRenderTarget_itHLECopyColorBufferToScanBuffer(MPTR colorBufferPtr, uin
LatteRenderTarget_copyToBackbuffer(texView, false);
}



// returns the current size of the virtual viewport (not the same as effective size, which can be influenced by texture rules)
void LatteRenderTarget_GetCurrentVirtualViewportSize(sint32* viewportWidth, sint32* viewportHeight)
{
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Latte/Core/LatteTextureLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ class TextureDecoder_R32_G32_UINT : public TextureDecoder, public SingletonClass
}
};


class TextureDecoder_R32_UINT : public TextureDecoder, public SingletonClass<TextureDecoder_R32_UINT>
{
public:
Expand Down Expand Up @@ -723,7 +722,6 @@ class TextureDecoder_R4_G4_B4_A4_UNORM : public TextureDecoder, public Singleton
}
};


class TextureDecoder_R4G4B4A4_UNORM_To_RGBA8 : public TextureDecoder, public SingletonClass<TextureDecoder_R4G4B4A4_UNORM_To_RGBA8>
{
public:
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/LatteTextureView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ void LatteTextureViewLookupCache::RemoveAll(LatteTextureView* view)
}
}


LatteTextureView* LatteTextureViewLookupCache::lookup(MPTR physAddr, sint32 width, sint32 height, sint32 depth, sint32 pitch, sint32 firstMip, sint32 numMip, sint32 firstSlice, sint32 numSlice, Latte::E_GX2SURFFMT format, Latte::E_DIM dim)
{
// todo - add tileMode param to this and the other lookup functions?
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/Core/LatteTiming.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ void LatteTiming_NotifyHostVSync()
auto dif = nowTimePoint - s_lastHostVsync;
auto vsyncPeriod = LatteTime_CalculateTimeBetweenVSync();


if (dif < vsyncPeriod)
{
// skip
Expand Down
2 changes: 0 additions & 2 deletions src/Cafe/HW/Latte/ISA/LatteReg.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ namespace Latte
U_HWFMT_32_32_32 = 0x2F,
U_HWFMT_32_32_32_FLOAT = 0x30,


};

enum class E_GX2SURFFMT // GX2 surface format
Expand Down Expand Up @@ -489,7 +488,6 @@ namespace Latte
SQ_TEX_SAMPLER_WORD1_0 = 0xF001,
SQ_TEX_SAMPLER_WORD2_0 = 0xF002,


};

inline constexpr int SAMPLER_BASE_INDEX_PIXEL = 0;
Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/ISA/RegDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@
#define mmSQ_GSTMP_RING_BASE 0x2316
#define mmSQ_GSTMP_RING_SIZE 0x2317


#define mmSQ_TEX_RESOURCE_WORD0 0xE000
#define mmSQ_ALU_CONSTANT0_0 0xC000

Expand Down
1 change: 0 additions & 1 deletion src/Cafe/HW/Latte/LatteAddrLib/AddrLibFastDecode.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ void optimizedDecodeLoop_tm04_numSamples1_8x8_optimizedRowCopy(LatteTextureLoade
// 6 -> 10
// 7 -> 11


if ((sizeof(texelBaseType)*texelBaseTypeCount) == 8)
{
// bpp = 64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2811,7 +2811,6 @@ void _emitTEXGetCompTexLodCode(LatteDecompilerShaderContext* shaderContext, Latt
debugBreakpoint();
}


_emitTypeConversionSuffix(shaderContext, LATTE_DECOMPILER_DTYPE_FLOAT, shaderContext->typeTracker.defaultDataType);
src->add(".");

Expand Down
3 changes: 0 additions & 3 deletions src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ void OpenGLRenderer::Initialize()
if (m_vendor == GfxVendor::Nvidia)
glClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);


glEnable(GL_PRIMITIVE_RESTART);
glPrimitiveRestartIndex(0xFFFFFFFF);

Expand Down Expand Up @@ -461,7 +460,6 @@ void OpenGLRenderer::ClearColorbuffer(bool padView)
glClear(GL_COLOR_BUFFER_BIT);
}


void OpenGLRenderer::HandleScreenshotRequest(LatteTextureView* texView, bool padView)
{
const bool hasScreenshotRequest = gui_hasScreenshotRequest();
Expand Down Expand Up @@ -1148,7 +1146,6 @@ void OpenGLRenderer::texture_clearDepthSlice(LatteTexture* hostTexture, uint32 s
catchOpenGLError();
}


void OpenGLRenderer::texture_clearSlice(LatteTexture* hostTextureGeneric, sint32 sliceIndex, sint32 mipIndex)
{
auto hostTexture = (LatteTextureGL*)hostTextureGeneric;
Expand Down
3 changes: 0 additions & 3 deletions src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "Cafe/GameProfile/GameProfile.h"
#include "config/ActiveSettings.h"


using _INDEX_TYPE = Latte::LATTE_VGT_DMA_INDEX_TYPE::E_INDEX_TYPE;

GLenum sGLActiveDrawMode = 0;
Expand Down Expand Up @@ -368,7 +367,6 @@ void _decodeAndUploadIndexData(indexDataCacheEntry2_t* cacheEntry)
}
}


void LatteDraw_cleanupAfterFrame()
{
// drop everything from cache that is older than 30 frames
Expand Down Expand Up @@ -1262,7 +1260,6 @@ void OpenGLRenderer::bufferCache_copy(uint32 srcOffset, uint32 dstOffset, uint32
glCopyBufferSubData(GL_ARRAY_BUFFER, GL_ARRAY_BUFFER, srcOffset, dstOffset, size);
}


GLint glClampTable[] =
{
GL_REPEAT,
Expand Down
Loading