Skip to content

Commit 3275869

Browse files
walbournwalbourn
committed
Reformat code
1 parent 56956f8 commit 3275869

14 files changed

+656
-582
lines changed

‎DirectXTex/BC.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -54,61 +54,61 @@ class HDRColorA
5454
HDRColorA(const HDRColorA& c) : r(c.r), g(c.g), b(c.b), a(c.a) {}
5555

5656
// binary operators
57-
HDRColorA operator + ( const HDRColorA& c ) const
57+
HDRColorA operator + (const HDRColorA& c) const
5858
{
5959
return HDRColorA(r + c.r, g + c.g, b + c.b, a + c.a);
6060
}
6161

62-
HDRColorA operator - ( const HDRColorA& c ) const
62+
HDRColorA operator - (const HDRColorA& c) const
6363
{
6464
return HDRColorA(r - c.r, g - c.g, b - c.b, a - c.a);
6565
}
6666

67-
HDRColorA operator * ( float f ) const
67+
HDRColorA operator * (float f) const
6868
{
6969
return HDRColorA(r * f, g * f, b * f, a * f);
7070
}
7171

72-
HDRColorA operator / ( float f ) const
72+
HDRColorA operator / (float f) const
7373
{
7474
float fInv = 1.0f / f;
7575
return HDRColorA(r * fInv, g * fInv, b * fInv, a * fInv);
7676
}
7777

78-
float operator * ( const HDRColorA& c ) const
78+
float operator * (const HDRColorA& c) const
7979
{
8080
return r * c.r + g * c.g + b * c.b + a * c.a;
8181
}
8282

8383
// assignment operators
84-
HDRColorA& operator += ( const HDRColorA& c )
84+
HDRColorA& operator += (const HDRColorA& c)
8585
{
8686
r += c.r;
8787
g += c.g;
8888
b += c.b;
8989
a += c.a;
9090
return *this;
9191
}
92-
93-
HDRColorA& operator -= ( const HDRColorA& c )
92+
93+
HDRColorA& operator -= (const HDRColorA& c)
9494
{
9595
r -= c.r;
9696
g -= c.g;
9797
b -= c.b;
9898
a -= c.a;
9999
return *this;
100100
}
101-
102-
HDRColorA& operator *= ( float f )
101+
102+
HDRColorA& operator *= (float f)
103103
{
104104
r *= f;
105105
g *= f;
106106
b *= f;
107107
a *= f;
108108
return *this;
109109
}
110-
111-
HDRColorA& operator /= ( float f )
110+
111+
HDRColorA& operator /= (float f)
112112
{
113113
float fInv = 1.0f / f;
114114
r *= fInv;

‎DirectXTex/BC6HBC7.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -3229,14 +3229,14 @@ void D3DX_BC7::EmitBlock(const EncodeParams* pEP, size_t uShape, size_t uRotatio
32293229
_Use_decl_annotations_
32303230
float D3DX_BC7::Refine(const EncodeParams* pEP, size_t uShape, size_t uRotation, size_t uIndexMode)
32313231
{
3232-
assert( pEP );
3233-
assert( uShape < BC7_MAX_SHAPES );
3234-
_Analysis_assume_( uShape < BC7_MAX_SHAPES );
3232+
assert(pEP);
3233+
assert(uShape < BC7_MAX_SHAPES);
3234+
_Analysis_assume_(uShape < BC7_MAX_SHAPES);
32353235
const LDREndPntPair* aEndPts = pEP->aEndPts[uShape];
32363236

32373237
const size_t uPartitions = ms_aInfo[pEP->uMode].uPartitions;
3238-
assert( uPartitions < BC7_MAX_REGIONS );
3239-
_Analysis_assume_( uPartitions < BC7_MAX_REGIONS );
3238+
assert(uPartitions < BC7_MAX_REGIONS);
3239+
_Analysis_assume_(uPartitions < BC7_MAX_REGIONS);
32403240

32413241
LDREndPntPair aOrgEndPts[BC7_MAX_REGIONS];
32423242
LDREndPntPair aOptEndPts[BC7_MAX_REGIONS];
@@ -3247,7 +3247,7 @@ float D3DX_BC7::Refine(const EncodeParams* pEP, size_t uShape, size_t uRotation,
32473247
float aOrgErr[BC7_MAX_REGIONS];
32483248
float aOptErr[BC7_MAX_REGIONS];
32493249

3250-
for(size_t p = 0; p <= uPartitions; p++)
3250+
for (size_t p = 0; p <= uPartitions; p++)
32513251
{
32523252
aOrgEndPts[p].A = Quantize(aEndPts[p].A, ms_aInfo[pEP->uMode].RGBAPrecWithP);
32533253
aOrgEndPts[p].B = Quantize(aEndPts[p].B, ms_aInfo[pEP->uMode].RGBAPrecWithP);
@@ -3258,12 +3258,12 @@ float D3DX_BC7::Refine(const EncodeParams* pEP, size_t uShape, size_t uRotation,
32583258
AssignIndices(pEP, uShape, uIndexMode, aOptEndPts, aOptIdx, aOptIdx2, aOptErr);
32593259

32603260
float fOrgTotErr = 0, fOptTotErr = 0;
3261-
for(size_t p = 0; p <= uPartitions; p++)
3261+
for (size_t p = 0; p <= uPartitions; p++)
32623262
{
32633263
fOrgTotErr += aOrgErr[p];
32643264
fOptTotErr += aOptErr[p];
32653265
}
3266-
if(fOptTotErr < fOrgTotErr)
3266+
if (fOptTotErr < fOrgTotErr)
32673267
{
32683268
EmitBlock(pEP, uShape, uRotation, uIndexMode, aOptEndPts, aOptIdx, aOptIdx2);
32693269
return fOptTotErr;

‎DirectXTex/BCDirectCompute.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,37 @@ namespace
4545
UINT reserved;
4646
};
4747

48-
static_assert( sizeof(ConstantsBC6HBC7) == sizeof(UINT)*8, "Constant buffer size mismatch" );
49-
50-
inline void RunComputeShader( ID3D11DeviceContext* pContext,
51-
ID3D11ComputeShader* shader,
52-
ID3D11ShaderResourceView** pSRVs,
53-
UINT srvCount,
54-
ID3D11Buffer* pCB,
55-
ID3D11UnorderedAccessView* pUAV,
56-
UINT X )
48+
static_assert(sizeof(ConstantsBC6HBC7) == sizeof(UINT) * 8, "Constant buffer size mismatch");
49+
50+
inline void RunComputeShader(ID3D11DeviceContext* pContext,
51+
ID3D11ComputeShader* shader,
52+
ID3D11ShaderResourceView** pSRVs,
53+
UINT srvCount,
54+
ID3D11Buffer* pCB,
55+
ID3D11UnorderedAccessView* pUAV,
56+
UINT X)
5757
{
5858
// Force UAV to nullptr before setting SRV since we are swapping buffers
5959
ID3D11UnorderedAccessView* nullUAV = nullptr;
60-
pContext->CSSetUnorderedAccessViews( 0, 1, &nullUAV, nullptr );
60+
pContext->CSSetUnorderedAccessViews(0, 1, &nullUAV, nullptr);
6161

62-
pContext->CSSetShader( shader, nullptr, 0 );
63-
pContext->CSSetShaderResources( 0, srvCount, pSRVs );
64-
pContext->CSSetUnorderedAccessViews( 0, 1, &pUAV, nullptr );
65-
pContext->CSSetConstantBuffers( 0, 1, &pCB );
66-
pContext->Dispatch( X, 1, 1 );
62+
pContext->CSSetShader(shader, nullptr, 0);
63+
pContext->CSSetShaderResources(0, srvCount, pSRVs);
64+
pContext->CSSetUnorderedAccessViews(0, 1, &pUAV, nullptr);
65+
pContext->CSSetConstantBuffers(0, 1, &pCB);
66+
pContext->Dispatch(X, 1, 1);
6767
}
6868

69-
inline void ResetContext( ID3D11DeviceContext* pContext )
69+
inline void ResetContext(ID3D11DeviceContext* pContext)
7070
{
7171
ID3D11UnorderedAccessView* nullUAV = nullptr;
72-
pContext->CSSetUnorderedAccessViews( 0, 1, &nullUAV, nullptr );
72+
pContext->CSSetUnorderedAccessViews(0, 1, &nullUAV, nullptr);
7373

7474
ID3D11ShaderResourceView* nullSRV[3] = { nullptr, nullptr, nullptr };
75-
pContext->CSSetShaderResources( 0, 3, nullSRV );
75+
pContext->CSSetShaderResources(0, 3, nullSRV);
7676

7777
ID3D11Buffer* nullBuffer[1] = { nullptr };
78-
pContext->CSSetConstantBuffers( 0, 1, nullBuffer );
78+
pContext->CSSetConstantBuffers(0, 1, nullBuffer);
7979
}
8080
};
8181

‎DirectXTex/BCDirectCompute.h

+38-38
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,53 @@
1212
namespace DirectX
1313
{
1414

15-
class GPUCompressBC
16-
{
17-
public:
18-
GPUCompressBC();
15+
class GPUCompressBC
16+
{
17+
public:
18+
GPUCompressBC();
19+
20+
HRESULT Initialize(_In_ ID3D11Device* pDevice);
1921

20-
HRESULT Initialize( _In_ ID3D11Device* pDevice );
22+
HRESULT Prepare(size_t width, size_t height, DWORD flags, DXGI_FORMAT format, float alphaWeight);
2123

22-
HRESULT Prepare( size_t width, size_t height, DWORD flags, DXGI_FORMAT format, float alphaWeight );
24+
HRESULT Compress(const Image& srcImage, const Image& destImage);
2325

24-
HRESULT Compress( const Image& srcImage, const Image& destImage );
26+
DXGI_FORMAT GetSourceFormat() const { return m_srcformat; }
2527

26-
DXGI_FORMAT GetSourceFormat() const { return m_srcformat; }
28+
private:
29+
DXGI_FORMAT m_bcformat;
30+
DXGI_FORMAT m_srcformat;
31+
float m_alphaWeight;
32+
bool m_bc7_mode02;
33+
bool m_bc7_mode137;
34+
size_t m_width;
35+
size_t m_height;
2736

28-
private:
29-
DXGI_FORMAT m_bcformat;
30-
DXGI_FORMAT m_srcformat;
31-
float m_alphaWeight;
32-
bool m_bc7_mode02;
33-
bool m_bc7_mode137;
34-
size_t m_width;
35-
size_t m_height;
37+
Microsoft::WRL::ComPtr<ID3D11Device> m_device;
38+
Microsoft::WRL::ComPtr<ID3D11DeviceContext> m_context;
3639

37-
Microsoft::WRL::ComPtr<ID3D11Device> m_device;
38-
Microsoft::WRL::ComPtr<ID3D11DeviceContext> m_context;
40+
Microsoft::WRL::ComPtr<ID3D11Buffer> m_err1;
41+
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_err1UAV;
42+
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_err1SRV;
3943

40-
Microsoft::WRL::ComPtr<ID3D11Buffer> m_err1;
41-
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_err1UAV;
42-
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_err1SRV;
44+
Microsoft::WRL::ComPtr<ID3D11Buffer> m_err2;
45+
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_err2UAV;
46+
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_err2SRV;
4347

44-
Microsoft::WRL::ComPtr<ID3D11Buffer> m_err2;
45-
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_err2UAV;
46-
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_err2SRV;
48+
Microsoft::WRL::ComPtr<ID3D11Buffer> m_output;
49+
Microsoft::WRL::ComPtr<ID3D11Buffer> m_outputCPU;
50+
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_outputUAV;
51+
Microsoft::WRL::ComPtr<ID3D11Buffer> m_constBuffer;
4752

48-
Microsoft::WRL::ComPtr<ID3D11Buffer> m_output;
49-
Microsoft::WRL::ComPtr<ID3D11Buffer> m_outputCPU;
50-
Microsoft::WRL::ComPtr<ID3D11UnorderedAccessView> m_outputUAV;
51-
Microsoft::WRL::ComPtr<ID3D11Buffer> m_constBuffer;
52-
53-
// Compute shader library
54-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_tryModeG10CS;
55-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_tryModeLE10CS;
56-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_encodeBlockCS;
53+
// Compute shader library
54+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_tryModeG10CS;
55+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_tryModeLE10CS;
56+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC6H_encodeBlockCS;
5757

58-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode456CS;
59-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode137CS;
60-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode02CS;
61-
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_encodeBlockCS;
62-
};
58+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode456CS;
59+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode137CS;
60+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_tryMode02CS;
61+
Microsoft::WRL::ComPtr<ID3D11ComputeShader> m_BC7_encodeBlockCS;
62+
};
6363

6464
} // namespace

0 commit comments

Comments
 (0)