Skip to content

A
angle
Commit c6a2dcf8 by Jamie Madill
Options

Fix improper getSamplerState in Context::applyTextures.

Introduced in cdf22f94. R=geofflang@chromium.org BUG= Review URL: https://codereview.appspot.com/20320043
parent f07558ac
Showing with 2 additions and 2 deletions
src/libGLESv2/Context.cpp
...@@ -2392,8 +2392,8 @@ void Context::applyTextures(SamplerType type) ...@@ -2392,8 +2392,8 @@ void Context::applyTextures(SamplerType type)
SamplerState samplerState; SamplerState samplerState;
texture->getSamplerState(&samplerState); texture->getSamplerState(&samplerState);
if (texture->isSamplerComplete(samplerState) && if ((mState.samplers[textureUnit] != 0) &&
boundFramebufferTextures.find(texture->getTextureSerial()) == boundFramebufferTextures.end()) (boundFramebufferTextures.find(texture->getTextureSerial()) == boundFramebufferTextures.end()))
{ {
Sampler *samplerObject = getSampler(mState.samplers[textureUnit]); Sampler *samplerObject = getSampler(mState.samplers[textureUnit]);
samplerObject->getState(&samplerState); samplerObject->getState(&samplerState);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment