random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-22 10:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings on gcc/clang

Browse Source
This commit is contained in:
Filip Gawin
2021-01-02 21:54:40 +01:00
parent 9c578580ec
commit c26386c112
16 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ps2/ps2.cpp
View File

@@ -588,13 +588,14 @@ getInstMeshInfo(MatPipeline *pipe, Geometry *g, Mesh *m)
im.numBrokenAttribs = 0;
im.vertexSize = 0;
for(uint i = 0; i < nelem(pipe->attribs); i++)
if(a = pipe->attribs[i])
if((a = pipe->attribs[i])) {
if(a->attrib & AT_RW)
im.numBrokenAttribs++;
else{
im.vertexSize += attribSize(a->attrib);
im.numAttribs++;
}
}
if(g->meshHeader->flags == MeshHeader::TRISTRIP){
im.numBatches = (m->numIndices-2) / (pipe->triStripCount-2);
im.batchVertCount = pipe->triStripCount;
@@ -758,13 +759,14 @@ MatPipeline::collectData(Geometry *g, InstanceData *inst, Mesh *m, uint8 *data[]
uint8 *raw = rwNewT(uint8, im.vertexSize*m->numIndices, MEMDUR_EVENT | ID_GEOMETRY);
uint8 *dp = raw;
for(uint i = 0; i < nelem(this->attribs); i++)
if(a = this->attribs[i])
if((a = this->attribs[i])) {
if(a->attrib & AT_RW){
data[i] = inst->data + im.attribPos[i]*0x10;
}else{
data[i] = dp;
dp += m->numIndices*attribSize(a->attrib);
}
}
uint8 *datap[nelem(this->attribs)];
memcpy(datap, data, sizeof(datap));
@@ -965,8 +967,8 @@ void
genericPreCB(MatPipeline *pipe, Geometry *geo)
{
PipeAttribute *a;
for(int32 i = 0; i < nelem(pipe->attribs); i++)
if(a = pipe->attribs[i])
for(int32 i = 0; i < (int)nelem(pipe->attribs); i++)
if((a = pipe->attribs[i]))
if(a == &attribXYZW){
allocateADC(geo);
break;
@@ -988,8 +990,8 @@ genericUninstanceCB(MatPipeline *pipe, Geometry *geo, uint32 flags[], Mesh *mesh
skin = Skin::get(geo);
PipeAttribute *a;
for(int32 i = 0; i < nelem(pipe->attribs); i++)
if(a = pipe->attribs[i]){
for(int32 i = 0; i < (int)nelem(pipe->attribs); i++)
if((a = pipe->attribs[i])){
if(a == &attribXYZ) xyz = (float32*)data[i];
else if(a == &attribXYZW) xyzw = (float32*)data[i];
else if(a == &attribUV) uv = (float32*)data[i];

78
src/ps2/ps2raster.cpp
View File

@@ -129,8 +129,8 @@ getRasterFormat(Raster *raster)
}
raster->depth = cameraZDepth;
if(pixelformat){
if(raster->depth == 16 && pixelformat != Raster::D16 ||
raster->depth == 32 && pixelformat != Raster::D32){
if((raster->depth == 16 && pixelformat != Raster::D16) ||
(raster->depth == 32 && pixelformat != Raster::D32)){
RWERROR((ERR_INVRASTER));
return 0;
}
@@ -668,29 +668,29 @@ calcOffsets(int32 width_Px, int32 height_Px, int32 psm, uint64 *bufferBase_B, ui
case PSMT4HL:
case PSMT4HH:
// ABCDE -> CADBE
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMCT32[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMCT32[bufferBase_B[n]&0x1F];
break;
case PSMT4:
case PSMCT16:
// ABCDE -> ADBEC
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMCT16[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMCT16[bufferBase_B[n]&0x1F];
break;
case PSMCT16S:
// ABCDE -> DBAEC
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMCT16S[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMCT16S[bufferBase_B[n]&0x1F];
break;
case PSMZ32:
case PSMZ24:
// ABCDE -> ~C~ADBE
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMZ32[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMZ32[bufferBase_B[n]&0x1F];
break;
case PSMZ16:
// ABCDE -> ~A~DBEC
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMZ16[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMZ16[bufferBase_B[n]&0x1F];
break;
case PSMZ16S:
// ABCDE -> ~D~BAEC
bufferBase_B[n] = bufferBase_B[n]&~0x1F | (uint64)blockmap_PSMZ16S[bufferBase_B[n]&0x1F];
bufferBase_B[n] = (bufferBase_B[n]&~0x1F) | (uint64)blockmap_PSMZ16S[bufferBase_B[n]&0x1F];
break;
default: break;
}
@@ -712,24 +712,24 @@ calcOffsets(int32 width_Px, int32 height_Px, int32 psm, uint64 *bufferBase_B, ui
case PSMT8H:
case PSMT4HL:
case PSMT4HH:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMCT32[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMCT32[paletteBase_B&0x1F];
break;
case PSMT4:
case PSMCT16:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMCT16[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMCT16[paletteBase_B&0x1F];
break;
case PSMCT16S:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMCT16S[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMCT16S[paletteBase_B&0x1F];
break;
case PSMZ32:
case PSMZ24:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMZ32[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMZ32[paletteBase_B&0x1F];
break;
case PSMZ16:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMZ16[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMZ16[paletteBase_B&0x1F];
break;
case PSMZ16S:
paletteBase_B = paletteBase_B&~0x1F | (uint64)blockmap_PSMZ16S[paletteBase_B&0x1F];
paletteBase_B = (paletteBase_B&~0x1F) | (uint64)blockmap_PSMZ16S[paletteBase_B&0x1F];
break;
default: break;
}
@@ -915,8 +915,8 @@ rasterCreateTexture(Raster *raster)
// If buffer width changes, align next address to page
if(bufferWidth[n] != lastBufferWidth){
nPagW = ((width >> n-1) + pageWidth-1)/pageWidth;
nPagH = ((height >> n-1) + pageHeight-1)/pageHeight;
nPagW = ((width >> (n-1)) + pageWidth-1)/pageWidth;
nPagH = ((height >> (n-1)) + pageHeight-1)/pageHeight;
nextaddress = (lastaddress + nPagW*nPagH*WD2PG) & ~(WD2PG-1);
}
lastBufferWidth = bufferWidth[n];
@@ -1052,8 +1052,8 @@ rasterCreateTexture(Raster *raster)
ras->flags |= Ps2Raster::SWIZZLED8;
if(cpsm == PSMCT32 && bufferWidth[numLevels-1] == 2){ // one page
// unswizzle the starting block of the last buffer and palette
uint32 bufbase_B = bufferBase[numLevels-1]&~0x1F | (uint64)blockmaprev_PSMCT32[bufferBase[numLevels-1]&0x1F];
uint32 palbase_B = ras->paletteBase&~0x1F | (uint64)blockmaprev_PSMCT32[ras->paletteBase&0x1F];
uint32 bufbase_B = (bufferBase[numLevels-1]&~0x1F) | (uint64)blockmaprev_PSMCT32[bufferBase[numLevels-1]&0x1F];
uint32 palbase_B = (ras->paletteBase&~0x1F) | (uint64)blockmaprev_PSMCT32[ras->paletteBase&0x1F];
// find start of page of last level (16,16 are PSMT8 block dimensions)
uint32 page_B = bufbase_B - 8*(dsay/16) - dsax/16;
// find palette DSAX/Y (in PSMCT32!)
@@ -1072,8 +1072,8 @@ rasterCreateTexture(Raster *raster)
// Looks like they wanted to swizzle palettes too...
if(cpsm == PSMCT16){
// unswizzle the starting block of the last buffer and palette
uint32 bufbase_B = bufferBase[numLevels-1]&~0x1F | (uint64)blockmaprev_PSMCT16[bufferBase[numLevels-1]&0x1F];
uint32 palbase_B = ras->paletteBase&~0x1F | (uint64)blockmaprev_PSMCT16[ras->paletteBase&0x1F];
uint32 bufbase_B = (bufferBase[numLevels-1]&~0x1F) | (uint64)blockmaprev_PSMCT16[bufferBase[numLevels-1]&0x1F];
uint32 palbase_B = (ras->paletteBase&~0x1F) | (uint64)blockmaprev_PSMCT16[ras->paletteBase&0x1F];
// find start of page of last level (32,16 are PSMT4 block dimensions)
uint32 page_B = bufbase_B - 4*(dsay/32) - dsax/16;
// find palette DSAX/Y (in PSMCT16!)
@@ -1149,8 +1149,8 @@ rasterCreateTexture(Raster *raster)
*p++ = 0;
// TRXPOS
if(ras->flags & Ps2Raster::SWIZZLED8 && psm == PSMT8 ||
ras->flags & Ps2Raster::SWIZZLED4 && psm == PSMT4){
if((ras->flags & Ps2Raster::SWIZZLED8 && psm == PSMT8) ||
(ras->flags & Ps2Raster::SWIZZLED4 && psm == PSMT4)){
*p++ = 0; // SSAX/Y is always 0
*p++ = (trxpos_hi[n] & ~0x10001)/2; // divide both DSAX/Y by 2
}else{
@@ -1161,8 +1161,8 @@ rasterCreateTexture(Raster *raster)
*p++ = 0;
// TRXREG
if(ras->flags & Ps2Raster::SWIZZLED8 && psm == PSMT8 ||
ras->flags & Ps2Raster::SWIZZLED4 && psm == PSMT4){
if((ras->flags & Ps2Raster::SWIZZLED8 && psm == PSMT8) ||
(ras->flags & Ps2Raster::SWIZZLED4 && psm == PSMT4)){
*p++ = mipw/2;
*p++ = miph/2;
}else{
@@ -1361,10 +1361,10 @@ swizzle(uint32 x, uint32 y, uint32 logw)
uint32 nx, ny, n;
x ^= (Y(1)^Y(2))<<2;
nx = x&7 | (x>>1)&~7;
ny = y&1 | (y>>1)&~1;
nx = (x&7) | ((x>>1)&~7);
ny = (y&1) | ((y>>1)&~1);
n = Y(1) | X(3)<<1;
return n | nx<<2 | ny<<logw-1+2;
return n | nx<<2 | ny<<(logw-1+2);
}
void
@@ -1388,17 +1388,17 @@ unswizzleRaster(Raster *raster)
px = raster->pixels;
logw = 0;
for(i = 1; i < w; i *= 2) logw++;
mask = (1<<logw+2)-1;
mask = (1<<(logw+2))-1;
if(raster->format & Raster::PAL4 && natras->flags & Ps2Raster::SWIZZLED4){
for(y = 0; y < h; y += 4){
memcpy(tmpbuf, &px[y<<logw-1], 2*w);
memcpy(tmpbuf, &px[y<<(logw-1)], 2*w);
for(i = 0; i < 4; i++)
for(x = 0; x < w; x++){
uint32 a = (y+i<<logw)+x;
uint32 a = ((y+i)<<logw)+x;
uint32 s = swizzle(x, y+i, logw)&mask;
uint8 c = s & 1 ? tmpbuf[s>>1] >> 4 : tmpbuf[s>>1] & 0xF;
px[a>>1] = a & 1 ? px[a>>1]&0xF | c<<4 : px[a>>1]&0xF0 | c;
px[a>>1] = a & 1 ? (px[a>>1]&0xF) | c<<4 : (px[a>>1]&0xF0) | c;
}
}
}else if(raster->format & Raster::PAL8 && natras->flags & Ps2Raster::SWIZZLED8){
@@ -1406,7 +1406,7 @@ unswizzleRaster(Raster *raster)
memcpy(tmpbuf, &px[y<<logw], 4*w);
for(i = 0; i < 4; i++)
for(x = 0; x < w; x++){
uint32 a = (y+i<<logw)+x;
uint32 a = ((y+i)<<logw)+x;
uint32 s = swizzle(x, y+i, logw)&mask;
px[a] = tmpbuf[s];
}
@@ -1435,24 +1435,24 @@ swizzleRaster(Raster *raster)
px = raster->pixels;
logw = 0;
for(i = 1; i < raster->width; i *= 2) logw++;
mask = (1<<logw+2)-1;
mask = (1<<(logw+2))-1;
if(raster->format & Raster::PAL4 && natras->flags & Ps2Raster::SWIZZLED4){
for(y = 0; y < h; y += 4){
for(i = 0; i < 4; i++)
for(x = 0; x < w; x++){
uint32 a = (y+i<<logw)+x;
uint32 a = ((y+i)<<logw)+x;
uint32 s = swizzle(x, y+i, logw)&mask;
uint8 c = a & 1 ? px[a>>1] >> 4 : px[a>>1] & 0xF;
tmpbuf[s>>1] = s & 1 ? tmpbuf[s>>1]&0xF | c<<4 : tmpbuf[s>>1]&0xF0 | c;
tmpbuf[s>>1] = s & 1 ? (tmpbuf[s>>1]&0xF) | c<<4 : (tmpbuf[s>>1]&0xF0) | c;
}
memcpy(&px[y<<logw-1], tmpbuf, 2*w);
memcpy(&px[y<<(logw-1)], tmpbuf, 2*w);
}
}else if(raster->format & Raster::PAL8 && natras->flags & Ps2Raster::SWIZZLED8){
for(y = 0; y < h; y += 4){
for(i = 0; i < 4; i++)
for(x = 0; x < w; x++){
uint32 a = (y+i<<logw)+x;
uint32 a = ((y+i)<<logw)+x;
uint32 s = swizzle(x, y+i, logw)&mask;
tmpbuf[s] = px[a];
}
@@ -1904,7 +1904,7 @@ registerNativeRaster(void)
void
printTEX0(uint64 tex0)
{
printf("%016llX ", tex0);
printf("%016lX ", tex0);
uint32 tbp0 = tex0 & 0x3FFF; tex0 >>= 14;
uint32 tbw = tex0 & 0x3F; tex0 >>= 6;
uint32 psm = tex0 & 0x3F; tex0 >>= 6;
@@ -1924,7 +1924,7 @@ printTEX0(uint64 tex0)
void
printTEX1(uint64 tex1)
{
printf("%016llX ", tex1);
printf("%016lX ", tex1);
uint32 lcm = tex1 & 0x1; tex1 >>= 2;
uint32 mxl = tex1 & 0x7; tex1 >>= 3;
uint32 mmag = tex1 & 0x1; tex1 >>= 1;