diff --git a/examples/dxPtexViewer/dxPtexViewer.cpp b/examples/dxPtexViewer/dxPtexViewer.cpp
index d56cd2ce..23a11c5f 100644
--- a/examples/dxPtexViewer/dxPtexViewer.cpp
+++ b/examples/dxPtexViewer/dxPtexViewer.cpp
@@ -1705,15 +1705,15 @@ initD3D11(HWND hWnd) {
             float specular[4];
         } lightSource[2];
     } lightingData = {
-        0.5, 0.2f, 1.0f, 0.0f,
-        0.1f, 0.1f, 0.1f, 1.0f,
-        0.7f, 0.7f, 0.7f, 1.0f,
-        0.8f, 0.8f, 0.8f, 1.0f,
+        {{ { 0.5, 0.2f, 1.0f, 0.0f },
+           { 0.1f, 0.1f, 0.1f, 1.0f },
+           { 0.7f, 0.7f, 0.7f, 1.0f },
+           { 0.8f, 0.8f, 0.8f, 1.0f } },
 
-        -0.8f, 0.4f, -1.0f, 0.0f,
-        0.0f, 0.0f, 0.0f, 1.0f,
-        0.5f, 0.5f, 0.5f, 1.0f,
-        0.8f, 0.8f, 0.8f, 1.0f,
+         { { -0.8f, 0.4f, -1.0f, 0.0f },
+           { 0.0f, 0.0f, 0.0f, 1.0f },
+           { 0.5f, 0.5f, 0.5f, 1.0f },
+           { 0.8f, 0.8f, 0.8f, 1.0f } }},
     };
 
     D3D11_BUFFER_DESC cbDesc;
diff --git a/examples/dxViewer/dxviewer.cpp b/examples/dxViewer/dxviewer.cpp
index 2e8e5ffd..2fbc94a8 100644
--- a/examples/dxViewer/dxviewer.cpp
+++ b/examples/dxViewer/dxviewer.cpp
@@ -1377,15 +1377,15 @@ initD3D11(HWND hWnd) {
                 float specular[4];
             } lightSource[2];
         } lightingData = {
-            0.5, 0.2f, 1.0f, 0.0f,
-            0.1f, 0.1f, 0.1f, 1.0f,
-            0.7f, 0.7f, 0.7f, 1.0f,
-            0.8f, 0.8f, 0.8f, 1.0f,
+            {{ { 0.5, 0.2f, 1.0f, 0.0f },
+               { 0.1f, 0.1f, 0.1f, 1.0f },
+               { 0.7f, 0.7f, 0.7f, 1.0f },
+               { 0.8f, 0.8f, 0.8f, 1.0f } },
 
-            -0.8f, 0.4f, -1.0f, 0.0f,
-            0.0f, 0.0f, 0.0f, 1.0f,
-            0.5f, 0.5f, 0.5f, 1.0f,
-            0.8f, 0.8f, 0.8f, 1.0f,
+             { { -0.8f, 0.4f, -1.0f, 0.0f },
+               { 0.0f, 0.0f, 0.0f, 1.0f },
+               { 0.5f, 0.5f, 0.5f, 1.0f },
+               { 0.8f, 0.8f, 0.8f, 1.0f } }},
         };
         D3D11_BUFFER_DESC cbDesc;
         ZeroMemory(&cbDesc, sizeof(cbDesc));
diff --git a/opensubdiv/osd/d3d11ComputeEvaluator.cpp b/opensubdiv/osd/d3d11ComputeEvaluator.cpp
index d881ce1d..e95ea72e 100644
--- a/opensubdiv/osd/d3d11ComputeEvaluator.cpp
+++ b/opensubdiv/osd/d3d11ComputeEvaluator.cpp
@@ -236,11 +236,11 @@ D3D11ComputeEvaluator::Compile(BufferDescriptor const &srcDesc,
     ss << _workGroupSize;  std::string workgroupSizeValue(ss.str()); ss.str("");
 
     D3D_SHADER_MACRO defines[] =
-        { "LENGTH", lengthValue.c_str(),
-          "SRC_STRIDE", srcStrideValue.c_str(),
-          "DST_STRIDE", dstStrideValue.c_str(),
-          "WORK_GROUP_SIZE", workgroupSizeValue.c_str(),
-          0, 0 };
+        { { "LENGTH", lengthValue.c_str() },
+          { "SRC_STRIDE", srcStrideValue.c_str() },
+          { "DST_STRIDE", dstStrideValue.c_str() },
+          { "WORK_GROUP_SIZE", workgroupSizeValue.c_str() },
+          { 0, 0 } };
 
     ID3DBlob * computeShaderBuffer = NULL;
     ID3DBlob * errorBuffer = NULL;