commit 687152872868ca57915af8859d77b6b13fe229c0
author jbauman@chromium.org <jbauman@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jul 12 23:28:41 2012 +0000
committer jbauman@chromium.org <jbauman@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jul 12 23:28:41 2012 +0000
tree ef94a1ae4e4691c911d4e4f2fd6bed2dafb2ae28
parent 07ab841a88e2779dec5d5a347a8403c7d84f28e8

Scale up non-multiple-of-4 dxt textures

D3D doesn't support DXT textures that aren't a multiple of 4 in size, so multiply the sizes by 2 or 4 so they work. Then ensure sampler parameters are set up correctly so they don't sample the unuploaded miplevels.

BUG=https://code.google.com/p/angleproject/issues/detail?id=237
TEST=

Review URL: https://codereview.appspot.com/6287045

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1222 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 1c2179e..f542399 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2410,6 +2410,7 @@
                         es2dx::ConvertMinFilter(minFilter, &d3dMinFilter, &d3dMipFilter, maxAnisotropy);
                         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MINFILTER, d3dMinFilter);
                         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MIPFILTER, d3dMipFilter);
+                        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXMIPLEVEL, texture->getLodOffset());
 
                         if (supportsTextureFilterAnisotropy())
                         {