Merge pull request #23 from ps2dev/stdint

use std int types

Author: rickgaiser

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++) {

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");
 

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);

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);
 };
 

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;

glut/src/pads.h

@@ -63,52 +63,52 @@ 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;
 
     bool IsDown(tPadStatus status, unsigned int button);
     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;

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

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"); }
 

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;

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