mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-11-09 13:50:05 +00:00
Fixed subobject initialization warnings
Fixed a few code sites where subobject initializers were missing braces.
This commit is contained in:
parent
f4bbf69d12
commit
a91707bae8
@ -1705,15 +1705,15 @@ initD3D11(HWND hWnd) {
|
|||||||
float specular[4];
|
float specular[4];
|
||||||
} lightSource[2];
|
} lightSource[2];
|
||||||
} lightingData = {
|
} lightingData = {
|
||||||
0.5, 0.2f, 1.0f, 0.0f,
|
{{ { 0.5, 0.2f, 1.0f, 0.0f },
|
||||||
0.1f, 0.1f, 0.1f, 1.0f,
|
{ 0.1f, 0.1f, 0.1f, 1.0f },
|
||||||
0.7f, 0.7f, 0.7f, 1.0f,
|
{ 0.7f, 0.7f, 0.7f, 1.0f },
|
||||||
0.8f, 0.8f, 0.8f, 1.0f,
|
{ 0.8f, 0.8f, 0.8f, 1.0f } },
|
||||||
|
|
||||||
-0.8f, 0.4f, -1.0f, 0.0f,
|
{ { -0.8f, 0.4f, -1.0f, 0.0f },
|
||||||
0.0f, 0.0f, 0.0f, 1.0f,
|
{ 0.0f, 0.0f, 0.0f, 1.0f },
|
||||||
0.5f, 0.5f, 0.5f, 1.0f,
|
{ 0.5f, 0.5f, 0.5f, 1.0f },
|
||||||
0.8f, 0.8f, 0.8f, 1.0f,
|
{ 0.8f, 0.8f, 0.8f, 1.0f } }},
|
||||||
};
|
};
|
||||||
|
|
||||||
D3D11_BUFFER_DESC cbDesc;
|
D3D11_BUFFER_DESC cbDesc;
|
||||||
|
@ -1377,15 +1377,15 @@ initD3D11(HWND hWnd) {
|
|||||||
float specular[4];
|
float specular[4];
|
||||||
} lightSource[2];
|
} lightSource[2];
|
||||||
} lightingData = {
|
} lightingData = {
|
||||||
0.5, 0.2f, 1.0f, 0.0f,
|
{{ { 0.5, 0.2f, 1.0f, 0.0f },
|
||||||
0.1f, 0.1f, 0.1f, 1.0f,
|
{ 0.1f, 0.1f, 0.1f, 1.0f },
|
||||||
0.7f, 0.7f, 0.7f, 1.0f,
|
{ 0.7f, 0.7f, 0.7f, 1.0f },
|
||||||
0.8f, 0.8f, 0.8f, 1.0f,
|
{ 0.8f, 0.8f, 0.8f, 1.0f } },
|
||||||
|
|
||||||
-0.8f, 0.4f, -1.0f, 0.0f,
|
{ { -0.8f, 0.4f, -1.0f, 0.0f },
|
||||||
0.0f, 0.0f, 0.0f, 1.0f,
|
{ 0.0f, 0.0f, 0.0f, 1.0f },
|
||||||
0.5f, 0.5f, 0.5f, 1.0f,
|
{ 0.5f, 0.5f, 0.5f, 1.0f },
|
||||||
0.8f, 0.8f, 0.8f, 1.0f,
|
{ 0.8f, 0.8f, 0.8f, 1.0f } }},
|
||||||
};
|
};
|
||||||
D3D11_BUFFER_DESC cbDesc;
|
D3D11_BUFFER_DESC cbDesc;
|
||||||
ZeroMemory(&cbDesc, sizeof(cbDesc));
|
ZeroMemory(&cbDesc, sizeof(cbDesc));
|
||||||
|
@ -236,11 +236,11 @@ D3D11ComputeEvaluator::Compile(BufferDescriptor const &srcDesc,
|
|||||||
ss << _workGroupSize; std::string workgroupSizeValue(ss.str()); ss.str("");
|
ss << _workGroupSize; std::string workgroupSizeValue(ss.str()); ss.str("");
|
||||||
|
|
||||||
D3D_SHADER_MACRO defines[] =
|
D3D_SHADER_MACRO defines[] =
|
||||||
{ "LENGTH", lengthValue.c_str(),
|
{ { "LENGTH", lengthValue.c_str() },
|
||||||
"SRC_STRIDE", srcStrideValue.c_str(),
|
{ "SRC_STRIDE", srcStrideValue.c_str() },
|
||||||
"DST_STRIDE", dstStrideValue.c_str(),
|
{ "DST_STRIDE", dstStrideValue.c_str() },
|
||||||
"WORK_GROUP_SIZE", workgroupSizeValue.c_str(),
|
{ "WORK_GROUP_SIZE", workgroupSizeValue.c_str() },
|
||||||
0, 0 };
|
{ 0, 0 } };
|
||||||
|
|
||||||
ID3DBlob * computeShaderBuffer = NULL;
|
ID3DBlob * computeShaderBuffer = NULL;
|
||||||
ID3DBlob * errorBuffer = NULL;
|
ID3DBlob * errorBuffer = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user