diff --git a/examples/logo/logo.cpp b/examples/logo/logo.cpp index 47f38269..7c047de9 100644 --- a/examples/logo/logo.cpp +++ b/examples/logo/logo.cpp @@ -536,12 +536,12 @@ void DrawMesh(const void* header) #define RTEX_FORMAT_RGBA8 1 #define RTEX_FORMAT_INDEX8 2 // 256 colour palette -#include "ps2s/types.h" // for tU128 +#include "ps2s/types.h" // for uint128_t void reorderClut(unsigned int* clut) { - tU128 buffer, *entries_1, *entries_2; - entries_1 = (tU128*)clut + 2; + uint128_t buffer, *entries_1, *entries_2; + entries_1 = (uint128_t*)clut + 2; entries_2 = entries_1 + 2; unsigned int i; for (i = 0; i < 8; i++) { diff --git a/examples/performance/performance.cpp b/examples/performance/performance.cpp index 71556c6e..e98c3707 100644 --- a/examples/performance/performance.cpp +++ b/examples/performance/performance.cpp @@ -566,7 +566,7 @@ void display(void) // float *material = (float*)Core::MemMappings::VU1Data + kMaterialEmission * 4; // Utils::QwordFloatDump( material, 4 ); - // tU32 *output = (tU32*)Core::MemMappings::VU1Data + kDoubleBufBase*4 + kOutputStart*4; + // uint32_t *output = (uint32_t*)Core::MemMappings::VU1Data + kDoubleBufBase*4 + kOutputStart*4; // Utils::QwordHexDump( output, 7 ); // printf("\n"); diff --git a/examples/tricked_out/billboard_renderer.cpp b/examples/tricked_out/billboard_renderer.cpp index 309450b1..1cab68ff 100644 --- a/examples/tricked_out/billboard_renderer.cpp +++ b/examples/tricked_out/billboard_renderer.cpp @@ -60,7 +60,7 @@ CBillboardRenderer::Register() pglRegisterCustomPrimType(kBillboardPrimType, // the prim type we will pass to ps2gl (glBegin...) kBillboardPrimTypeFlag, // the corresponding renderer requirement - ~(tU64)0xffffffff, // we only care about the custom stuff (upper 32 bits) + ~(uint64_t)0xffffffff, // we only care about the custom stuff (upper 32 bits) true); // ok to merge multiple calls when possible return renderer; @@ -99,7 +99,7 @@ void CBillboardRenderer::DrawLinearArrays(CGeometryBlock& block) DrawBlock(packet, block, maxVertsPerBuffer); } -void CBillboardRenderer::InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged) +void CBillboardRenderer::InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged) { CGLContext& glContext = *pGLContext; CVifSCDmaPacket& packet = glContext.GetVif1Packet(); @@ -115,7 +115,7 @@ void CBillboardRenderer::InitContext(GLenum primType, tU32 rcChanges, bool userR bool alpha = drawContext.GetBlendEnabled(); bool useTexture = glContext.GetTexManager().GetTexEnabled(); GS::tPrim prim = { prim_type : 6, iip : 0, tme : useTexture, fge : 0, abe : alpha, aa1 : 0, fst : 0, ctxt : 0, fix : 0 }; - tGifTag giftag = { NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(tU64*)&prim, FLG : 0, NREG : 4, REGS0 : 2, REGS1 : 4, REGS2 : 2, REGS3 : 4 }; + tGifTag giftag = { NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(uint64_t*)&prim, FLG : 0, NREG : 4, REGS0 : 2, REGS1 : 4, REGS2 : 2, REGS3 : 4 }; packet.Pad96(); packet.OpenUnpack(Vifs::UnpackModes::v4_32, kGifTag, Packet::kSingleBuff); diff --git a/examples/tricked_out/billboard_renderer.h b/examples/tricked_out/billboard_renderer.h index 2a96913b..f07e5b07 100644 --- a/examples/tricked_out/billboard_renderer.h +++ b/examples/tricked_out/billboard_renderer.h @@ -15,8 +15,8 @@ #include "ps2gl/linear_renderer.h" #include "ps2gl/renderer.h" -#define kBillboardPrimType (((tU32)1 << 31) | 1) -#define kBillboardPrimTypeFlag ((tU64)1 << 32) +#define kBillboardPrimType (((uint32_t)1 << 31) | 1) +#define kBillboardPrimTypeFlag ((uint64_t)1 << 32) class CBillboardRenderer : public CLinearRenderer { static void* Microcode; @@ -26,7 +26,7 @@ class CBillboardRenderer : public CLinearRenderer { static CBillboardRenderer* Register(); - virtual void InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged); + virtual void InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged); virtual void DrawLinearArrays(CGeometryBlock& block); }; diff --git a/glut/src/pads.cpp b/glut/src/pads.cpp index 8473113c..1d829e05 100644 --- a/glut/src/pads.cpp +++ b/glut/src/pads.cpp @@ -102,7 +102,7 @@ bool CPad::Open(void) void CPad::Read(void) { - t32 padState = padGetState(kPort0, kSlot0); + int32_t padState = padGetState(kPort0, kSlot0); if (padState != PAD_STATE_STABLE) return; @@ -121,7 +121,7 @@ void CPad::Read(void) padStatus.leftStick = CurStatus.leftStick; CurStatus = padStatus; - // t32 id = padInfoMode( uiPort, kSlot0, PAD_MODECURID, 0 ); + // int32_t id = padInfoMode( uiPort, kSlot0, PAD_MODECURID, 0 ); // if ( id == kPadModeStandard || id == kPadModeAnalog ) { // // flip the sense of the bit field (1 = pressed) // CurStatus.buttons ^= 0xffff; @@ -144,7 +144,7 @@ void CPad::Read(void) bool CPad::UpdateStick(tStickData* stickCur, tStickData* stickLast) { - t8 temp; + int8_t temp; bool isChanged = false; using namespace Math; diff --git a/glut/src/pads.h b/glut/src/pads.h index 8e6cb38e..0f6b173c 100644 --- a/glut/src/pads.h +++ b/glut/src/pads.h @@ -63,44 +63,44 @@ class CPad { private: typedef struct { - tU16 select : 1; - tU16 i : 1; - tU16 j : 1; - tU16 start : 1; - - tU16 leftUp : 1; - tU16 leftRight : 1; - tU16 leftDown : 1; - tU16 leftLeft : 1; - - tU16 l2 : 1; - tU16 r2 : 1; - tU16 l1 : 1; - tU16 r1 : 1; - - tU16 rightUp : 1; - tU16 rightRight : 1; - tU16 rightDown : 1; - tU16 rightLeft : 1; + uint16_t select : 1; + uint16_t i : 1; + uint16_t j : 1; + uint16_t start : 1; + + uint16_t leftUp : 1; + uint16_t leftRight : 1; + uint16_t leftDown : 1; + uint16_t leftLeft : 1; + + uint16_t l2 : 1; + uint16_t r2 : 1; + uint16_t l1 : 1; + uint16_t r1 : 1; + + uint16_t rightUp : 1; + uint16_t rightRight : 1; + uint16_t rightDown : 1; + uint16_t rightLeft : 1; } tButtonsPressed; typedef struct { - tU8 xVal, yVal; - tU8 xCenter, yCenter; + uint8_t xVal, yVal; + uint8_t xCenter, yCenter; float xPos, yPos; bool isCentered; } tStickData; typedef struct { - tU8 success; - tU8 statLen; - tU16 buttons; /* 16 buttons */ - tU8 r3h; - tU8 r3v; - tU8 l3h; - tU8 l3v; - tU8 kanAtsu[12]; // deal with this crap later - tU8 whoKnows[12]; // make the structure 32 bytes long + uint8_t success; + uint8_t statLen; + uint16_t buttons; /* 16 buttons */ + uint8_t r3h; + uint8_t r3v; + uint8_t l3h; + uint8_t l3v; + uint8_t kanAtsu[12]; // deal with this crap later + uint8_t whoKnows[12]; // make the structure 32 bytes long tStickData rightStick, leftStick; } tPadStatus; @@ -108,7 +108,7 @@ class CPad { bool IsUp(tPadStatus status, unsigned int button); bool UpdateStick(tStickData* stickCur, tStickData* stickLast); - tU128 DmaBuffer[scePadDmaBufferMax] __attribute__((aligned(64))); + uint128_t DmaBuffer[scePadDmaBufferMax] __attribute__((aligned(64))); tPadStatus CurStatus __attribute__((aligned(16))); tPadStatus LastStatus __attribute__((aligned(16))); unsigned int uiPort; diff --git a/include/ps2gl/base_renderer.h b/include/ps2gl/base_renderer.h index eb190c67..a6e4859a 100644 --- a/include/ps2gl/base_renderer.h +++ b/include/ps2gl/base_renderer.h @@ -98,7 +98,7 @@ class CBaseRenderer : public CRenderer { // used by XferBlock void XferVectors(CVifSCDmaPacket& packet, unsigned int* dataStart, int startOffset, int numVectors, int wordsPerVec, - Vifs::tMask unpackMask, tU32 unpackMode, + Vifs::tMask unpackMask, uint32_t unpackMode, int vu1MemOffset); // used by InitContext diff --git a/include/ps2gl/dlgmanager.h b/include/ps2gl/dlgmanager.h index 8c90715e..4136c77b 100644 --- a/include/ps2gl/dlgmanager.h +++ b/include/ps2gl/dlgmanager.h @@ -38,8 +38,8 @@ class CDListGeomManager : public CGeomManager { // user state - void EnableCustom(tU64 flag); - void DisableCustom(tU64 flag); + void EnableCustom(uint64_t flag); + void DisableCustom(uint64_t flag); void SetUserRenderContextChanged() { mError("not implemented yet"); } diff --git a/include/ps2gl/glcontext.h b/include/ps2gl/glcontext.h index 73204c02..d9ed0f62 100644 --- a/include/ps2gl/glcontext.h +++ b/include/ps2gl/glcontext.h @@ -108,9 +108,9 @@ class CGLContext { // state changes - tU32 RendererContextChanged, SavedRendererContextChanges; - tU32 GsContextChanged, SavedGsContextChanges; - tU32 RendererPropsChanged, SavedRendererPropsChanges; + uint32_t RendererContextChanged, SavedRendererContextChanges; + uint32_t GsContextChanged, SavedGsContextChanges; + uint32_t RendererPropsChanged, SavedRendererPropsChanges; bool StateChangesArePushed; inline void PushStateChanges() @@ -162,7 +162,7 @@ class CGLContext { /// this value will be written to the signal register as the last /// item in the dma chain. The method to query its value is below. - static const tU64 Ps2glSignalId = 0xffffffff00000000 | (tU32)'G' << 24 | (tU32)'L' << 16; + static const uint64_t Ps2glSignalId = 0xffffffff00000000 | (uint32_t)'G' << 24 | (uint32_t)'L' << 16; /// Semaphores signaled by the gs int handler static int RenderingFinishedSemaId, ImmediateRenderingFinishedSemaId, VsyncSemaId; @@ -234,7 +234,7 @@ class CGLContext { * This is the upper 16 bits of the 32-bit values written to the signal * register by ps2gl. (The lower 16 bits are used to differentiate signals.) */ - static tU16 GetPs2glSignalId() { return (tU16)(Ps2glSignalId >> 16); } + static uint16_t GetPs2glSignalId() { return (uint16_t)(Ps2glSignalId >> 16); } /** * util - add a block of memory to a list to be freed at the end of the @@ -374,19 +374,19 @@ class CGLContext { // ps2 rendering - inline tU32 GetRendererContextChanged() const { return RendererContextChanged; } + inline uint32_t GetRendererContextChanged() const { return RendererContextChanged; } inline void SetRendererContextChanged(bool changed) { RendererContextChanged = (changed) ? 0xff : 0; } - inline tU32 GetGsContextChanged() const { return GsContextChanged; } + inline uint32_t GetGsContextChanged() const { return GsContextChanged; } inline void SetGsContextChanged(bool changed) { GsContextChanged = (changed) ? 0xff : 0; } - inline tU32 GetRendererPropsChanged() const { return RendererPropsChanged; } + inline uint32_t GetRendererPropsChanged() const { return RendererPropsChanged; } inline void SetRendererPropsChanged(bool changed) { RendererPropsChanged = (changed) ? 0xff : 0; diff --git a/include/ps2gl/gmanager.h b/include/ps2gl/gmanager.h index a83f6900..bc110fb7 100644 --- a/include/ps2gl/gmanager.h +++ b/include/ps2gl/gmanager.h @@ -80,8 +80,8 @@ class CVertArray { */ typedef struct { - tU64 requirements; - tU64 rendererReqMask; + uint64_t requirements; + uint64_t rendererReqMask; bool mergeContiguous; } tUserPrimEntry; @@ -132,8 +132,8 @@ class CGeomManager { static inline bool IsUserPrimType(unsigned int prim) { return (prim & 0x80000000); } static inline void RegisterUserPrimType(GLenum prim, - tU64 requirements, - tU64 rendererReqMask, + uint64_t requirements, + uint64_t rendererReqMask, bool mergeContiguous) { CheckPrimAccess(prim); @@ -143,7 +143,7 @@ class CGeomManager { UserPrimTypes[prim].mergeContiguous = mergeContiguous; } - static inline tU64 GetUserPrimRequirements(GLenum prim) + static inline uint64_t GetUserPrimRequirements(GLenum prim) { CheckPrimAccess(prim); prim &= 0x7fffffff; @@ -157,7 +157,7 @@ class CGeomManager { return UserPrimTypes[prim].mergeContiguous; } - static inline tU64 GetUserPrimReqMask(GLenum prim) + static inline uint64_t GetUserPrimReqMask(GLenum prim) { CheckPrimAccess(prim); prim &= 0x7fffffff; @@ -185,8 +185,8 @@ class CGeomManager { // user state - virtual void EnableCustom(tU64 flag) = 0; - virtual void DisableCustom(tU64 flag) = 0; + virtual void EnableCustom(uint64_t flag) = 0; + virtual void DisableCustom(uint64_t flag) = 0; // rendering interface diff --git a/include/ps2gl/immgmanager.h b/include/ps2gl/immgmanager.h index 0c9d1d34..cb37e4c3 100644 --- a/include/ps2gl/immgmanager.h +++ b/include/ps2gl/immgmanager.h @@ -64,8 +64,8 @@ class CImmGeomManager : public CGeomManager { // user state - void EnableCustom(tU64 flag) { RendererManager.EnableCustom(flag); } - void DisableCustom(tU64 flag) { RendererManager.DisableCustom(flag); } + void EnableCustom(uint64_t flag) { RendererManager.EnableCustom(flag); } + void DisableCustom(uint64_t flag) { RendererManager.DisableCustom(flag); } // geometry specification diff --git a/include/ps2gl/indexed_renderer.h b/include/ps2gl/indexed_renderer.h index 8c1d7611..5b00990f 100644 --- a/include/ps2gl/indexed_renderer.h +++ b/include/ps2gl/indexed_renderer.h @@ -18,7 +18,7 @@ class CIndexedRenderer : public CBaseRenderer { int inQuadsPerVert, int outQuadsPerVert, const char* name); - virtual void InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged); + virtual void InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged); virtual void DrawIndexedArrays(CGeometryBlock& block); virtual int GetPacketQwordSize(const CGeometryBlock& geometry); virtual CRendererProps GetRenderContextDeps(); diff --git a/include/ps2gl/linear_renderer.h b/include/ps2gl/linear_renderer.h index f3ca2f9d..ff921014 100644 --- a/include/ps2gl/linear_renderer.h +++ b/include/ps2gl/linear_renderer.h @@ -57,7 +57,7 @@ class CLinearRenderer : public CBaseRenderer { { } - virtual void InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged); + virtual void InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged); virtual void DrawLinearArrays(CGeometryBlock& block); virtual int GetPacketQwordSize(const CGeometryBlock& geometry); virtual CRendererProps GetRenderContextDeps(); diff --git a/include/ps2gl/renderer.h b/include/ps2gl/renderer.h index 7930375a..37557b62 100644 --- a/include/ps2gl/renderer.h +++ b/include/ps2gl/renderer.h @@ -18,38 +18,38 @@ class CRendererProps { public: - tU64 PrimType : 3; - tU64 Lighting : 1; - tU64 NumDirLights : 2; - tU64 NumPtLights : 3; - tU64 Texture : 1; - tU64 Specular : 1; - tU64 PerVtxMaterial : 3; - tU64 Clipping : 2; - tU64 CullFace : 1; - tU64 TwoSidedLighting : 1; - tU64 ArrayAccess : 2; - - tU64 unused : 12; - - tU64 UserProps : 32; + uint64_t PrimType : 3; + uint64_t Lighting : 1; + uint64_t NumDirLights : 2; + uint64_t NumPtLights : 3; + uint64_t Texture : 1; + uint64_t Specular : 1; + uint64_t PerVtxMaterial : 3; + uint64_t Clipping : 2; + uint64_t CullFace : 1; + uint64_t TwoSidedLighting : 1; + uint64_t ArrayAccess : 2; + + uint64_t unused : 12; + + uint64_t UserProps : 32; // convert to unsigned 64-bit value - inline operator tU64() const + inline operator uint64_t() const { // this hack doesn't work on linux since the compiler thinks this is a 32-bit // machine.. // asm (" ### CRendererProps to uint ### " : "=r" (value) : "0" (*this) ); - tU64* value = (tU64*)this; + uint64_t* value = (uint64_t*)this; return *value; } - inline void operator=(tU64 value) + inline void operator=(uint64_t value) { // see above.. - // asm(" ### CRendererProps assign from u64 ### " : "=r" (*(tU64*)this) : "0" (value) ); + // asm(" ### CRendererProps assign from u64 ### " : "=r" (*(uint64_t*)this) : "0" (value) ); *this = *(CRendererProps*)&value; } @@ -88,23 +88,23 @@ class CVertArray; */ class CRenderer { protected: - tU64 Capabilities; - tU64 Requirements; + uint64_t Capabilities; + uint64_t Requirements; // this class can't be instantiated CRenderer() {} - CRenderer(tU64 caps, tU64 reqs) + CRenderer(uint64_t caps, uint64_t reqs) : Capabilities(caps) , Requirements(reqs) { } - void SetCapabilities(tU64 caps) { Capabilities = caps; } - void SetRequirements(tU64 reqs) { Requirements = reqs; } + void SetCapabilities(uint64_t caps) { Capabilities = caps; } + void SetRequirements(uint64_t reqs) { Requirements = reqs; } public: - virtual tU64 GetCapabilities() const { return Capabilities; } - virtual tU64 GetRequirements() const { return Requirements; } + virtual uint64_t GetCapabilities() const { return Capabilities; } + virtual uint64_t GetRequirements() const { return Requirements; } /// called by the geometry manager when the default renderer context has changed, /// when the user context has changed, or after the renderer has been loaded @@ -116,7 +116,7 @@ class CRenderer { /// @param rcChanges changed in the rendering context as returned by /// CGLContext::GetRendererContextChanged(). /// @param userRcChanged whether the user (custom) rendering context has changed - virtual void InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged) = 0; + virtual void InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged) = 0; /// Load the renderer into vu0/vu1 memory. virtual void Load() = 0; diff --git a/include/ps2gl/renderermanager.h b/include/ps2gl/renderermanager.h index dbec9f5d..bc5e5290 100644 --- a/include/ps2gl/renderermanager.h +++ b/include/ps2gl/renderermanager.h @@ -33,8 +33,8 @@ typedef enum { kDirectional, kSpot } tLightType; typedef struct { - tU64 capabilities; - tU64 requirements; + uint64_t capabilities; + uint64_t requirements; CRenderer* renderer; } tRenderer; @@ -43,7 +43,7 @@ class CRendererManager { CRendererProps RendererRequirements; bool RendererReqsHaveChanged; - tU64 CurUserPrimReqs, CurUserPrimReqMask; + uint64_t CurUserPrimReqs, CurUserPrimReqMask; static const int kMaxDefaultRenderers = 64; static const int kMaxUserRenderers = PGL_MAX_CUSTOM_RENDERERS; @@ -66,12 +66,12 @@ class CRendererManager { CRenderer& GetCurRenderer() { return *(CurrentRenderer->renderer); } CRendererProps GetRendererReqs() const { return RendererRequirements; } - bool IsCurRendererCustom() const { return ((tU32)CurrentRenderer >= (tU32)UserRenderers); } + bool IsCurRendererCustom() const { return ((uint32_t)CurrentRenderer >= (uint32_t)UserRenderers); } // state updates - void EnableCustom(tU64 flag); - void DisableCustom(tU64 flag); + void EnableCustom(uint64_t flag); + void DisableCustom(uint64_t flag); void NumLightsChanged(tLightType type, int num); void PrimChanged(unsigned int prim); diff --git a/include/ps2gl/texture.h b/include/ps2gl/texture.h index 17961213..931b906c 100644 --- a/include/ps2gl/texture.h +++ b/include/ps2gl/texture.h @@ -61,7 +61,7 @@ class CTexManager { void SetTexMode(GS::tTexMode mode); void SetCurTexParam(GLenum pname, GLint param); - void SetCurTexImage(tU128* imagePtr, tU32 w, tU32 h, + void SetCurTexImage(uint128_t* imagePtr, uint32_t w, uint32_t h, GS::tPSM psm); void SetGsTexture(GS::CMemArea& area); void SetCurClut(const void* clut, int numEntries); @@ -110,7 +110,7 @@ class CMMTexture : public GS::CTexture { ~CMMTexture(); void SetImage(const GS::CMemArea& area); - void SetImage(tU128* imagePtr, tU32 w, tU32 h, GS::tPSM psm); + void SetImage(uint128_t* imagePtr, uint32_t w, uint32_t h, GS::tPSM psm, uint32_t* clutPtr = NULL); void SetClut(const CMMClut& clut) { diff --git a/src/base_renderer.cpp b/src/base_renderer.cpp index cdee3cb8..82887290 100644 --- a/src/base_renderer.cpp +++ b/src/base_renderer.cpp @@ -252,7 +252,7 @@ void CBaseRenderer::AddVu1RendererContext(CVifSCDmaPacket& packet, GLenum primTy packet += numPts; packet += numSpots; } else { - packet += (tU64)0; + packet += (uint64_t)0; packet += 0; } @@ -302,7 +302,7 @@ void CBaseRenderer::AddVu1RendererContext(CVifSCDmaPacket& packet, GLenum primTy globalAmb = lighting.GetGlobalAmbient() * maxColorValue; else globalAmb = cpu_vec_4(0, 0, 0, 0); - packet.Add((tU32*)&globalAmb, 3); + packet.Add((uint32_t*)&globalAmb, 3); // stick in the offset to convert clip space depth value to GS float depthClipToGs = (float)((1 << drawContext.GetDepthBits()) - 1) / 2.0f; @@ -387,7 +387,7 @@ CBaseRenderer::BuildGiftag(GLenum primType) unsigned int nreg = OutputQuadsPerVert; GS::tPrim prim = { prim_type : primType, iip : smoothShading, tme : useTexture, fge : 0, abe : alpha, aa1 : 0, fst : 0, ctxt : 0, fix : 0 }; - tGifTag giftag = { NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(tU64*)&prim, FLG : 0, NREG : nreg, REGS0 : 2, REGS1 : 1, REGS2 : 4 }; + tGifTag giftag = { NLOOP : 0, EOP : 1, pad0 : 0, id : 0, PRE : 1, PRIM : *(uint64_t*)&prim, FLG : 0, NREG : nreg, REGS0 : 2, REGS1 : 1, REGS2 : 4 }; return giftag; } @@ -431,7 +431,7 @@ void CBaseRenderer::Load() void CBaseRenderer::XferVectors(CVifSCDmaPacket& packet, unsigned int* dataStart, int startOffset, int numVectors, int wordsPerVec, - Vifs::tMask unpackMask, tU32 unpackMode, + Vifs::tMask unpackMask, uint32_t unpackMode, int vu1MemOffset) { // find number of words to prepend with a cnt diff --git a/src/clear.cpp b/src/clear.cpp index d0f275b0..72c0586e 100644 --- a/src/clear.cpp +++ b/src/clear.cpp @@ -59,7 +59,7 @@ void CClearEnv::ClearBuffers(unsigned int bitMask) pDrawEnv->SetFrameBufferDrawMask(0xffffffff); CVifSCDmaPacket& packet = pGLContext->GetVif1Packet(); - pGLContext->AddingDrawEnvToPacket((tU128*)pGLContext->GetVif1Packet().GetNextPtr() + 1); + pGLContext->AddingDrawEnvToPacket((uint128_t*)pGLContext->GetVif1Packet().GetNextPtr() + 1); pDrawEnv->SendSettings(packet); pSprite->Draw(packet); } diff --git a/src/dlgmanager.cpp b/src/dlgmanager.cpp index 70684aaf..1b5c3d2a 100644 --- a/src/dlgmanager.cpp +++ b/src/dlgmanager.cpp @@ -466,7 +466,7 @@ class CDrawArraysCmd : public CDListCmd { bool IsCached; CDList& DList; CVifSCDmaPacket* RenderPacket; - tU64 RenderContextDependencies, RenderContextDepMask; + uint64_t RenderContextDependencies, RenderContextDepMask; public: CDrawArraysCmd(CGeometryBlock& block, CDList& dlist) @@ -492,9 +492,9 @@ class CDrawArraysCmd : public CDListCmd { // the packet is called in a context different from that in which it was // first created. - tU64 curRenderContext = (tU64)pGLContext->GetImmGeomManager().GetRendererManager().GetRendererReqs(); - tU64 curRenderContextDeps = curRenderContext & RenderContextDepMask; - bool rebuildPacket = (curRenderContextDeps != RenderContextDependencies); + uint64_t curRenderContext = (uint64_t)pGLContext->GetImmGeomManager().GetRendererManager().GetRendererReqs(); + uint64_t curRenderContextDeps = curRenderContext & RenderContextDepMask; + bool rebuildPacket = (curRenderContextDeps != RenderContextDependencies); // [re]build cached dma packet @@ -678,10 +678,10 @@ void CDListGeomManager::DrawBlock(CGeometryBlock& block) } class CEnableCustomCmd : public CDListCmd { - tU64 Flag; + uint64_t Flag; public: - CEnableCustomCmd(tU64 flag) + CEnableCustomCmd(uint64_t flag) : Flag(flag) { } @@ -692,16 +692,16 @@ class CEnableCustomCmd : public CDListCmd { } }; -void CDListGeomManager::EnableCustom(tU64 flag) +void CDListGeomManager::EnableCustom(uint64_t flag) { *CurDList += CEnableCustomCmd(flag); } class CDisableCustomCmd : public CDListCmd { - tU64 Flag; + uint64_t Flag; public: - CDisableCustomCmd(tU64 flag) + CDisableCustomCmd(uint64_t flag) : Flag(flag) { } @@ -712,7 +712,7 @@ class CDisableCustomCmd : public CDListCmd { } }; -void CDListGeomManager::DisableCustom(tU64 flag) +void CDListGeomManager::DisableCustom(uint64_t flag) { *CurDList += CDisableCustomCmd(flag); } diff --git a/src/glcontext.cpp b/src/glcontext.cpp index d5d76098..6a398d1e 100644 --- a/src/glcontext.cpp +++ b/src/glcontext.cpp @@ -319,7 +319,7 @@ void CGLContext::EndVif1Packet(unsigned short signalNum) { *Vif1Packet += giftag; *Vif1Packet += Ps2glSignalId | signalNum; - *Vif1Packet += (tU64)0x60; // signal + *Vif1Packet += (uint64_t)0x60; // signal } Vif1Packet->CloseDirect(); Vif1Packet->CloseTag(); @@ -340,12 +340,12 @@ int CGLContext::GsIntHandler(int cause) { int ret = 0; - tU32 csr = *(volatile tU32*)GS::ControlRegs::csr; + uint32_t csr = *(volatile uint32_t*)GS::ControlRegs::csr; // is this a signal interrupt? if (csr & 1) { // is it one of ours? - tU64 sigLblId = *(volatile tU64*)GS::ControlRegs::siglblid; - if ((tU16)(sigLblId >> 16) == GetPs2glSignalId()) { + uint64_t sigLblId = *(volatile uint64_t*)GS::ControlRegs::siglblid; + if ((uint16_t)(sigLblId >> 16) == GetPs2glSignalId()) { switch (sigLblId & 0xffff) { case 1: iSignalSema(RenderingFinishedSemaId); @@ -361,7 +361,7 @@ int CGLContext::GsIntHandler(int cause) // clear our signal id sigLblId &= ~0xffffffff; - *(volatile tU64*)GS::ControlRegs::siglblid = sigLblId; + *(volatile uint64_t*)GS::ControlRegs::siglblid = sigLblId; // clear the exception and wait for the next *(volatile unsigned int*)GS::ControlRegs::csr = 1; @@ -412,7 +412,7 @@ void CGLContext::WaitForVSync() while (PollSema(VsyncSemaId) != -1) ; // sceGsSyncV(0); - tU32 csr = *(volatile tU32*)GS::ControlRegs::csr; + uint32_t csr = *(volatile uint32_t*)GS::ControlRegs::csr; IsCurrentFieldEven = (bool)((csr >> 13) & 1); } diff --git a/src/gmanager.cpp b/src/gmanager.cpp index e58c7237..2636b1c3 100644 --- a/src/gmanager.cpp +++ b/src/gmanager.cpp @@ -489,7 +489,7 @@ void pglRegisterCustomPrimType(GLenum primType, */ void pglEnableCustom(pglU64_t flag) { - flag &= ~(tU64)0xffffffff; + flag &= ~(uint64_t)0xffffffff; pGLContext->GetGeomManager().EnableCustom(flag); } @@ -501,7 +501,7 @@ void pglEnableCustom(pglU64_t flag) */ void pglDisableCustom(pglU64_t flag) { - flag &= ~(tU64)0xffffffff; + flag &= ~(uint64_t)0xffffffff; pGLContext->GetGeomManager().DisableCustom(flag); } diff --git a/src/immgmanager.cpp b/src/immgmanager.cpp index f8506605..378f0706 100644 --- a/src/immgmanager.cpp +++ b/src/immgmanager.cpp @@ -377,7 +377,7 @@ void CImmGeomManager::SyncRendererContext(GLenum primType) void CImmGeomManager::SyncGsContext() { - if (tU32 changed = GLContext.GetGsContextChanged()) { + if (uint32_t changed = GLContext.GetGsContextChanged()) { // has the texture changed? bool texEnabled = GLContext.GetTexManager().GetTexEnabled(); CVifSCDmaPacket& packet = GLContext.GetVif1Packet(); @@ -398,7 +398,7 @@ void CImmGeomManager::SyncGsContext() packet.Flush().Nop(); packet.CloseTag(); // FIXME - GLContext.AddingDrawEnvToPacket((tU128*)GLContext.GetVif1Packet().GetNextPtr() + 1); + GLContext.AddingDrawEnvToPacket((uint128_t*)GLContext.GetVif1Packet().GetNextPtr() + 1); GLContext.GetImmDrawContext().GetDrawEnv().SendSettings(GLContext.GetVif1Packet()); } diff --git a/src/indexed_renderer.cpp b/src/indexed_renderer.cpp index 71f15e62..075dd21f 100644 --- a/src/indexed_renderer.cpp +++ b/src/indexed_renderer.cpp @@ -28,7 +28,7 @@ CIndexedRenderer::CIndexedRenderer(void* packet, int packetSize, CRendererProps kGifTag, kContextLength, kContextLength); } -void CIndexedRenderer::InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged) +void CIndexedRenderer::InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged) { CGLContext& glContext = *pGLContext; CVifSCDmaPacket& packet = glContext.GetVif1Packet(); @@ -81,7 +81,7 @@ CRendererProps CIndexedRenderer::GetRenderContextDeps() { CRendererProps deps; - deps = (tU64)0; + deps = (uint64_t)0; deps.Lighting = 1; deps.Texture = 1; deps.PerVtxMaterial = 1; diff --git a/src/linear_renderer.cpp b/src/linear_renderer.cpp index 82f0d719..78a1dc32 100644 --- a/src/linear_renderer.cpp +++ b/src/linear_renderer.cpp @@ -49,7 +49,7 @@ void CLinearRenderer::DrawLinearArrays(CGeometryBlock& block) DrawBlock(packet, block, maxVertsPerBuffer); } -void CLinearRenderer::InitContext(GLenum primType, tU32 rcChanges, bool userRcChanged) +void CLinearRenderer::InitContext(GLenum primType, uint32_t rcChanges, bool userRcChanged) { CGLContext& glContext = *pGLContext; CVifSCDmaPacket& packet = glContext.GetVif1Packet(); @@ -79,7 +79,7 @@ CRendererProps CLinearRenderer::GetRenderContextDeps() { CRendererProps deps; - deps = (tU64)0; + deps = (uint64_t)0; deps.Lighting = 1; deps.Texture = 1; deps.PerVtxMaterial = 1; @@ -293,7 +293,7 @@ void CLinearRenderer::XferBufferHeader(CVifSCDmaPacket& packet, // num vertices packet += numVerts; packet += 0; - packet += (tU64)0; + packet += (uint64_t)0; // adc bits for the beginning of strips.. 16 24-bit values of following format: // bits 0-9 : offset into output geometry (not including giftag) diff --git a/src/renderermanager.cpp b/src/renderermanager.cpp index 3daaf194..dda444ca 100644 --- a/src/renderermanager.cpp +++ b/src/renderermanager.cpp @@ -46,7 +46,7 @@ CRendererManager::CRendererManager(CGLContext& context) RendererRequirements.UserProps = 0; CRendererProps no_reqs; - no_reqs = (tU64)0; + no_reqs = (uint64_t)0; // indexed array renderer { @@ -338,23 +338,23 @@ void CRendererManager::RegisterUserRenderer(CRenderer* renderer) // state updates -void CRendererManager::EnableCustom(tU64 flag) +void CRendererManager::EnableCustom(uint64_t flag) { - tU64 newState = RendererRequirements; + uint64_t newState = RendererRequirements; newState |= flag; - if (newState != (tU64)RendererRequirements) + if (newState != (uint64_t)RendererRequirements) RendererReqsHaveChanged = true; RendererRequirements = newState; } -void CRendererManager::DisableCustom(tU64 flag) +void CRendererManager::DisableCustom(uint64_t flag) { - tU64 newState = RendererRequirements; + uint64_t newState = RendererRequirements; newState &= ~flag; - if (newState != (tU64)RendererRequirements) + if (newState != (uint64_t)RendererRequirements) RendererReqsHaveChanged = true; RendererRequirements = newState; @@ -406,7 +406,7 @@ void CRendererManager::PrimChanged(unsigned int prim) if (CGeomManager::IsUserPrimType(prim)) { // user-defined - tU64 newState = RendererRequirements; + uint64_t newState = RendererRequirements; // clear the current user prim flags (if any) newState &= ~CurUserPrimReqs; @@ -419,7 +419,7 @@ void CRendererManager::PrimChanged(unsigned int prim) CurUserPrimReqMask = CGeomManager::GetUserPrimReqMask(prim); - if ((tU64)RendererRequirements != newState) { + if ((uint64_t)RendererRequirements != newState) { RendererRequirements = newState; RendererReqsHaveChanged = true; } @@ -431,11 +431,11 @@ void CRendererManager::PrimChanged(unsigned int prim) if (CurUserPrimReqs) { RendererReqsHaveChanged = true; // clear any requirements set by a user prim type - newState = (tU64)newState & ~CurUserPrimReqs; + newState = (uint64_t)newState & ~CurUserPrimReqs; CurUserPrimReqs = 0; } - CurUserPrimReqMask = ~(tU32)0; + CurUserPrimReqMask = ~(uint32_t)0; if (prim <= GL_LINE_STRIP) newState.PrimType = kPtsLinesStripsFans; @@ -557,7 +557,7 @@ bool CRendererManager::UpdateNewRenderer() rreqs.TwoSidedLighting = 0; } - rreqs = (tU64)rreqs & CurUserPrimReqMask; + rreqs = (uint64_t)rreqs & CurUserPrimReqMask; // first check the user renderers @@ -591,10 +591,10 @@ bool CRendererManager::UpdateNewRenderer() mErrorIf(i == NumDefaultRenderers, "Couldn't find a suitable renderer..\n" "state reqs = 0x%08x 0x%08x, mask = %08x %08x\n", - (tU32)((tU64)rreqs >> 32), - (tU32)((tU64)rreqs), - (tU32)((tU64)CurUserPrimReqMask >> 32), - (tU32)((tU64)CurUserPrimReqMask)); + (uint32_t)((uint64_t)rreqs >> 32), + (uint32_t)((uint64_t)rreqs), + (uint32_t)((uint64_t)CurUserPrimReqMask >> 32), + (uint32_t)((uint64_t)CurUserPrimReqMask)); NewRenderer = &DefaultRenderers[i]; diff --git a/src/texture.cpp b/src/texture.cpp index 76d8cbfd..4c186cae 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -256,12 +256,12 @@ void CTexManager::SetCurTexParam(GLenum pname, GLint param) } class CSetCurTexImageCmd : public CDListCmd { - tU128* Image; + uint128_t* Image; unsigned int Width, Height; GS::tPSM Psm; public: - CSetCurTexImageCmd(tU128* image, unsigned int w, unsigned int h, + CSetCurTexImageCmd(uint128_t* image, unsigned int w, unsigned int h, GS::tPSM psm) : Image(image) , Width(w) @@ -276,7 +276,7 @@ class CSetCurTexImageCmd : public CDListCmd { } }; -void CTexManager::SetCurTexImage(tU128* imagePtr, tU32 w, tU32 h, +void CTexManager::SetCurTexImage(uint128_t* imagePtr, uint32_t w, uint32_t h, GS::tPSM psm) { GLContext.TextureChanged(); @@ -379,7 +379,7 @@ CMMTexture::~CMMTexture() /** * Use the given image in main ram as the texture. */ -void CMMTexture::SetImage(tU128* imagePtr, tU32 w, tU32 h, GS::tPSM psm) +void CMMTexture::SetImage(uint128_t* imagePtr, uint32_t w, uint32_t h, GS::tPSM psm, uint32_t* clutPtr) { if (pImageMem) { // we are being re-initialized @@ -387,10 +387,10 @@ void CMMTexture::SetImage(tU128* imagePtr, tU32 w, tU32 h, GS::tPSM psm) CTexture::Reset(); } - CTexture::SetImage(imagePtr, w, h, psm, NULL); + CTexture::SetImage(imagePtr, w, h, psm, clutPtr); // create a memarea for the image - tU32 bufWidth = gsrTex0.tb_width * 64; + uint32_t bufWidth = gsrTex0.tb_width * 64; pImageMem = new GS::CMemArea(bufWidth, h, psm, GS::kAlignBlock); XferImage = true; @@ -643,7 +643,7 @@ void glTexImage2D(GLenum target, if (psm != GS::kInvalidPsm) { CTexManager& tm = pGLContext->GetTexManager(); - tm.SetCurTexImage((tU128*)pixels, width, height, psm); + tm.SetCurTexImage((uint128_t*)pixels, width, height, psm); } } diff --git a/vu1/vu1_context.h b/vu1/vu1_context.h index 70b9ffdb..fc02249e 100644 --- a/vu1/vu1_context.h +++ b/vu1/vu1_context.h @@ -7,10 +7,10 @@ // lights typedef struct { - tU32 dir; - tU32 point; - tU32 spot; - tU32 dummy; + uint32_t dir; + uint32_t point; + uint32_t spot; + uint32_t dummy; } tLightPtrs; #define kNumLights (kContextStart) // x = directional, y = point, z = spot