summaryrefslogtreecommitdiffstats
path: root/tools/render-test/render-d3d11.cpp
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2017-11-04 18:43:26 -0400
committerYong He <yonghe@outlook.com>2017-11-04 18:43:26 -0400
commita4fabfc85527bd4807a603dcde7c0a3762b11136 (patch)
treefd7201b0ce9938081c4bde1f9e79ec646056ed02 /tools/render-test/render-d3d11.cpp
parent00e03825d80c4997fa35461d82ff267f721ae8a6 (diff)
parent215ce206838db63fdd310a0ababe421799011d21 (diff)
Merge remote-tracking branch 'refs/remotes/official/master'
Diffstat (limited to 'tools/render-test/render-d3d11.cpp')
-rw-r--r--tools/render-test/render-d3d11.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/render-test/render-d3d11.cpp b/tools/render-test/render-d3d11.cpp
index 47f486a0d..c5c3f68b8 100644
--- a/tools/render-test/render-d3d11.cpp
+++ b/tools/render-test/render-d3d11.cpp
@@ -394,7 +394,7 @@ public:
}
dxImmediateContext->OMSetRenderTargets(
- dxRenderTargetViews.Count(),
+ (UINT)dxRenderTargetViews.Count(),
dxRenderTargetViews.Buffer(),
NULL);
@@ -772,7 +772,7 @@ public:
{
auto dxContext = dxImmediateContext;
D3D11_BUFFER_DESC desc = {0};
- desc.ByteWidth = bufferData.Count() * sizeof(unsigned int);
+ desc.ByteWidth = (UINT)(bufferData.Count() * sizeof(unsigned int));
if (bufferDesc.type == InputBufferType::ConstantBuffer)
{
desc.Usage = D3D11_USAGE_DEFAULT;
@@ -966,7 +966,7 @@ public:
case ShaderInputType::Buffer:
{
createInputBuffer(entry.bufferDesc, entry.bufferData, rsEntry.buffer, rsEntry.uav, rsEntry.srv);
- rsEntry.bufferLength = entry.bufferData.Count() * sizeof(unsigned int);
+ rsEntry.bufferLength = (int)(entry.bufferData.Count() * sizeof(unsigned int));
}
break;
case ShaderInputType::Texture: