Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-13 05:30:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed -Wextra-semi-stmt warnings

Browse Source
This commit is contained in:
Chuck Walbourn 2019-06-26 12:47:34 -07:00
parent f55158d557
commit d628e4427f
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DirectXTex/DirectXTexConvert.cpp
View File

@ -874,16 +874,16 @@ _Use_decl_annotations_ bool DirectX::_LoadScanline(
return false; return false;
case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R10G10B10A2_UNORM:
LOAD_SCANLINE(XMUDECN4, XMLoadUDecN4); LOAD_SCANLINE(XMUDECN4, XMLoadUDecN4)
case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
LOAD_SCANLINE(XMUDECN4, XMLoadUDecN4_XR); LOAD_SCANLINE(XMUDECN4, XMLoadUDecN4_XR)
case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R10G10B10A2_UINT:
LOAD_SCANLINE(XMUDEC4, XMLoadUDec4); LOAD_SCANLINE(XMUDEC4, XMLoadUDec4)
case DXGI_FORMAT_R11G11B10_FLOAT: case DXGI_FORMAT_R11G11B10_FLOAT:
LOAD_SCANLINE3(XMFLOAT3PK, XMLoadFloat3PK, g_XMIdentityR3); LOAD_SCANLINE3(XMFLOAT3PK, XMLoadFloat3PK, g_XMIdentityR3)
case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM:
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
@ -1553,7 +1553,7 @@ _Use_decl_annotations_ bool DirectX::_LoadScanline(
case XBOX_DXGI_FORMAT_R10G10B10_SNORM_A2_UNORM: case XBOX_DXGI_FORMAT_R10G10B10_SNORM_A2_UNORM:
// Xbox One specific format // Xbox One specific format
LOAD_SCANLINE(XMXDECN4, XMLoadXDecN4); LOAD_SCANLINE(XMXDECN4, XMLoadXDecN4)
case XBOX_DXGI_FORMAT_R4G4_UNORM: case XBOX_DXGI_FORMAT_R4G4_UNORM:
// Xbox One specific format // Xbox One specific format
@ -1700,16 +1700,16 @@ bool DirectX::_StoreScanline(
return false; return false;
case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R10G10B10A2_UNORM:
STORE_SCANLINE(XMUDECN4, XMStoreUDecN4); STORE_SCANLINE(XMUDECN4, XMStoreUDecN4)
case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
STORE_SCANLINE(XMUDECN4, XMStoreUDecN4_XR); STORE_SCANLINE(XMUDECN4, XMStoreUDecN4_XR)
case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R10G10B10A2_UINT:
STORE_SCANLINE(XMUDEC4, XMStoreUDec4); STORE_SCANLINE(XMUDEC4, XMStoreUDec4)
case DXGI_FORMAT_R11G11B10_FLOAT: case DXGI_FORMAT_R11G11B10_FLOAT:
STORE_SCANLINE(XMFLOAT3PK, XMStoreFloat3PK); STORE_SCANLINE(XMFLOAT3PK, XMStoreFloat3PK)
case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM:
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
@ -2426,7 +2426,7 @@ bool DirectX::_StoreScanline(
case XBOX_DXGI_FORMAT_R10G10B10_SNORM_A2_UNORM: case XBOX_DXGI_FORMAT_R10G10B10_SNORM_A2_UNORM:
// Xbox One specific format // Xbox One specific format
STORE_SCANLINE(XMXDECN4, XMStoreXDecN4); STORE_SCANLINE(XMXDECN4, XMStoreXDecN4)
case XBOX_DXGI_FORMAT_R4G4_UNORM: case XBOX_DXGI_FORMAT_R4G4_UNORM:
// Xbox One specific format // Xbox One specific format
@ -4749,7 +4749,7 @@ namespace
{ {
case DXGI_FORMAT_NV12: case DXGI_FORMAT_NV12:
assert(destImage.format == DXGI_FORMAT_YUY2); assert(destImage.format == DXGI_FORMAT_YUY2);
CONVERT_420_TO_422(uint8_t, XMUBYTEN4); CONVERT_420_TO_422(uint8_t, XMUBYTEN4)
return S_OK; return S_OK;
case DXGI_FORMAT_P010: case DXGI_FORMAT_P010:
@ -4759,7 +4759,7 @@ namespace
case DXGI_FORMAT_P016: case DXGI_FORMAT_P016:
assert(destImage.format == DXGI_FORMAT_Y216); assert(destImage.format == DXGI_FORMAT_Y216);
CONVERT_420_TO_422(uint16_t, XMUSHORTN4); CONVERT_420_TO_422(uint16_t, XMUSHORTN4)
return S_OK; return S_OK;
case DXGI_FORMAT_NV11: case DXGI_FORMAT_NV11:

44
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -1044,7 +1044,7 @@ namespace
{ {
size_t x2 = x << 1; size_t x2 = x << 1;
AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2]); AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2])
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -1156,7 +1156,7 @@ namespace
{ {
auto& toX = lfX[x]; auto& toX = lfX[x];
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1); BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -1336,12 +1336,12 @@ namespace
XMVECTOR C0, C1, C2, C3; XMVECTOR C0, C1, C2, C3;
CUBIC_INTERPOLATE(C0, toX.x, row0[toX.u0], row0[toX.u1], row0[toX.u2], row0[toX.u3]); CUBIC_INTERPOLATE(C0, toX.x, row0[toX.u0], row0[toX.u1], row0[toX.u2], row0[toX.u3])
CUBIC_INTERPOLATE(C1, toX.x, row1[toX.u0], row1[toX.u1], row1[toX.u2], row1[toX.u3]); CUBIC_INTERPOLATE(C1, toX.x, row1[toX.u0], row1[toX.u1], row1[toX.u2], row1[toX.u3])
CUBIC_INTERPOLATE(C2, toX.x, row2[toX.u0], row2[toX.u1], row2[toX.u2], row2[toX.u3]); CUBIC_INTERPOLATE(C2, toX.x, row2[toX.u0], row2[toX.u1], row2[toX.u2], row2[toX.u3])
CUBIC_INTERPOLATE(C3, toX.x, row3[toX.u0], row3[toX.u1], row3[toX.u2], row3[toX.u3]); CUBIC_INTERPOLATE(C3, toX.x, row3[toX.u0], row3[toX.u1], row3[toX.u2], row3[toX.u3])
CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3); CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3)
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -1882,7 +1882,7 @@ namespace
size_t x2 = x << 1; size_t x2 = x << 1;
AVERAGE8(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2], AVERAGE8(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2],
vrow0[x2], vrow1[x2], vrow2[x2], vrow3[x2]); vrow0[x2], vrow1[x2], vrow2[x2], vrow3[x2])
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -1925,7 +1925,7 @@ namespace
{ {
size_t x2 = x << 1; size_t x2 = x << 1;
AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2]); AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2])
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -2058,7 +2058,7 @@ namespace
{ {
auto& toX = lfX[x]; auto& toX = lfX[x];
TRILINEAR_INTERPOLATE(target[x], toX, toY, toZ, urow0, urow1, vrow0, vrow1); TRILINEAR_INTERPOLATE(target[x], toX, toY, toZ, urow0, urow1, vrow0, vrow1)
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -2118,7 +2118,7 @@ namespace
{ {
auto& toX = lfX[x]; auto& toX = lfX[x];
BILINEAR_INTERPOLATE(target[x], toX, toY, urow0, urow1); BILINEAR_INTERPOLATE(target[x], toX, toY, urow0, urow1)
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -2360,15 +2360,15 @@ namespace
for (size_t j = 0; j < 4; ++j) for (size_t j = 0; j < 4; ++j)
{ {
XMVECTOR C0, C1, C2, C3; XMVECTOR C0, C1, C2, C3;
CUBIC_INTERPOLATE(C0, toX.x, urow[j][toX.u0], urow[j][toX.u1], urow[j][toX.u2], urow[j][toX.u3]); CUBIC_INTERPOLATE(C0, toX.x, urow[j][toX.u0], urow[j][toX.u1], urow[j][toX.u2], urow[j][toX.u3])
CUBIC_INTERPOLATE(C1, toX.x, vrow[j][toX.u0], vrow[j][toX.u1], vrow[j][toX.u2], vrow[j][toX.u3]); CUBIC_INTERPOLATE(C1, toX.x, vrow[j][toX.u0], vrow[j][toX.u1], vrow[j][toX.u2], vrow[j][toX.u3])
CUBIC_INTERPOLATE(C2, toX.x, srow[j][toX.u0], srow[j][toX.u1], srow[j][toX.u2], srow[j][toX.u3]); CUBIC_INTERPOLATE(C2, toX.x, srow[j][toX.u0], srow[j][toX.u1], srow[j][toX.u2], srow[j][toX.u3])
CUBIC_INTERPOLATE(C3, toX.x, trow[j][toX.u0], trow[j][toX.u1], trow[j][toX.u2], trow[j][toX.u3]); CUBIC_INTERPOLATE(C3, toX.x, trow[j][toX.u0], trow[j][toX.u1], trow[j][toX.u2], trow[j][toX.u3])
CUBIC_INTERPOLATE(D[j], toY.x, C0, C1, C2, C3); CUBIC_INTERPOLATE(D[j], toY.x, C0, C1, C2, C3)
} }
CUBIC_INTERPOLATE(target[x], toZ.x, D[0], D[1], D[2], D[3]); CUBIC_INTERPOLATE(target[x], toZ.x, D[0], D[1], D[2], D[3])
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))
@ -2492,12 +2492,12 @@ namespace
auto& toX = cfX[x]; auto& toX = cfX[x];
XMVECTOR C0, C1, C2, C3; XMVECTOR C0, C1, C2, C3;
CUBIC_INTERPOLATE(C0, toX.x, urow[0][toX.u0], urow[0][toX.u1], urow[0][toX.u2], urow[0][toX.u3]); CUBIC_INTERPOLATE(C0, toX.x, urow[0][toX.u0], urow[0][toX.u1], urow[0][toX.u2], urow[0][toX.u3])
CUBIC_INTERPOLATE(C1, toX.x, vrow[0][toX.u0], vrow[0][toX.u1], vrow[0][toX.u2], vrow[0][toX.u3]); CUBIC_INTERPOLATE(C1, toX.x, vrow[0][toX.u0], vrow[0][toX.u1], vrow[0][toX.u2], vrow[0][toX.u3])
CUBIC_INTERPOLATE(C2, toX.x, srow[0][toX.u0], srow[0][toX.u1], srow[0][toX.u2], srow[0][toX.u3]); CUBIC_INTERPOLATE(C2, toX.x, srow[0][toX.u0], srow[0][toX.u1], srow[0][toX.u2], srow[0][toX.u3])
CUBIC_INTERPOLATE(C3, toX.x, trow[0][toX.u0], trow[0][toX.u1], trow[0][toX.u2], trow[0][toX.u3]); CUBIC_INTERPOLATE(C3, toX.x, trow[0][toX.u0], trow[0][toX.u1], trow[0][toX.u2], trow[0][toX.u3])
CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3); CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3)
} }
if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter)) if (!_StoreScanlineLinear(pDest, dest->rowPitch, dest->format, target, nwidth, filter))

14
DirectXTex/DirectXTexResize.cpp
View File

@ -352,7 +352,7 @@ namespace
{ {
size_t x2 = x << 1; size_t x2 = x << 1;
AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2]); AVERAGE4(target[x], urow0[x2], urow1[x2], urow2[x2], urow3[x2])
} }
if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter)) if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter))
@ -438,7 +438,7 @@ namespace
{ {
auto& toX = lfX[x]; auto& toX = lfX[x];
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1); BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
} }
if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter)) if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter))
@ -593,12 +593,12 @@ namespace
XMVECTOR C0, C1, C2, C3; XMVECTOR C0, C1, C2, C3;
CUBIC_INTERPOLATE(C0, toX.x, row0[toX.u0], row0[toX.u1], row0[toX.u2], row0[toX.u3]); CUBIC_INTERPOLATE(C0, toX.x, row0[toX.u0], row0[toX.u1], row0[toX.u2], row0[toX.u3])
CUBIC_INTERPOLATE(C1, toX.x, row1[toX.u0], row1[toX.u1], row1[toX.u2], row1[toX.u3]); CUBIC_INTERPOLATE(C1, toX.x, row1[toX.u0], row1[toX.u1], row1[toX.u2], row1[toX.u3])
CUBIC_INTERPOLATE(C2, toX.x, row2[toX.u0], row2[toX.u1], row2[toX.u2], row2[toX.u3]); CUBIC_INTERPOLATE(C2, toX.x, row2[toX.u0], row2[toX.u1], row2[toX.u2], row2[toX.u3])
CUBIC_INTERPOLATE(C3, toX.x, row3[toX.u0], row3[toX.u1], row3[toX.u2], row3[toX.u3]); CUBIC_INTERPOLATE(C3, toX.x, row3[toX.u0], row3[toX.u1], row3[toX.u2], row3[toX.u3])
CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3); CUBIC_INTERPOLATE(target[x], toY.x, C0, C1, C2, C3)
} }
if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter)) if (!_StoreScanlineLinear(pDest, destImage.rowPitch, destImage.format, target, destImage.width, filter))

2
DirectXTex/filters.h
View File

@ -99,7 +99,7 @@ inline void _CreateLinearFilter(_In_ size_t source, _In_ size_t dest, _In_ bool
#define BILINEAR_INTERPOLATE( res, x, y, r0, r1 ) \ #define BILINEAR_INTERPOLATE( res, x, y, r0, r1 ) \
res = XMVectorAdd(XMVectorScale(XMVectorAdd(XMVectorScale((r0)[ x.u0 ], x.weight0), XMVectorScale((r0)[ x.u1 ], x.weight1)), y.weight0), \ res = XMVectorAdd(XMVectorScale(XMVectorAdd(XMVectorScale((r0)[ x.u0 ], x.weight0), XMVectorScale((r0)[ x.u1 ], x.weight1)), y.weight0), \
XMVectorScale(XMVectorAdd(XMVectorScale((r1)[ x.u0 ], x.weight0), XMVectorScale((r1)[ x.u1 ], x.weight1)), y.weight1) ) XMVectorScale(XMVectorAdd(XMVectorScale((r1)[ x.u0 ], x.weight0), XMVectorScale((r1)[ x.u1 ], x.weight1)), y.weight1) );
#define TRILINEAR_INTERPOLATE( res, x, y, z, r0, r1, r2, r3 ) \ #define TRILINEAR_INTERPOLATE( res, x, y, z, r0, r1, r2, r3 ) \
{\ {\