aboutsummaryrefslogtreecommitdiff
path: root/src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp
diff options
context:
space:
mode:
authorGeoff Lang <geofflang@chromium.org>2014-09-05 16:28:14 -0400
committerGeoff Lang <geofflang@chromium.org>2014-09-18 19:13:05 +0000
commit76b10c9a9735c27627065d9fe68f78374ef48934 (patch)
tree3720943e40719deedb1da2adde725bbba92235ca /src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp
parentac7579c2bd0cc9afdf5892a766e6967bf3a341f0 (diff)
downloadangle-76b10c9a9735c27627065d9fe68f78374ef48934.tar.gz
Use dynamically sized containers for texture and sampler bindings.
BUG=angle:685 Change-Id: I7af97a95deee69fbdebca2b57403244f45516e67 Reviewed-on: https://chromium-review.googlesource.com/216564 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
Diffstat (limited to 'src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp')
-rw-r--r--src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp b/src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp
index 39bec903..b1867fba 100644
--- a/src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -944,7 +944,7 @@ void GenerateCaps(ID3D11Device *device, gl::Caps *caps, gl::TextureCapsMap *text
static_cast<GLint64>(caps->maxFragmentUniformComponents);
caps->maxVaryingComponents = GetMaximumVertexOutputVectors(featureLevel) * 4;
caps->maxVaryingVectors = GetMaximumVertexOutputVectors(featureLevel);
- caps->maxCombinedTextureImageUnits = caps->maxVertexTextureImageUnits + caps->maxFragmentInputComponents;
+ caps->maxCombinedTextureImageUnits = caps->maxVertexTextureImageUnits + caps->maxTextureImageUnits;
// Transform feedback limits
caps->maxTransformFeedbackInterleavedComponents = GetMaximumStreamOutputInterleavedComponenets(featureLevel);