Clamp GLSL textureSize() lod to mipmap range

Bug chromium:980816 Change-Id: Ic4393668f82316e475baa5e753d891dfb1e30572 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33728 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Clamp GLSL textureSize() lod to mipmap range
1d4f5775 · Nicolas Capens · Nicolas Capens · 49f8051e · 1d4f5775
Commit 1d4f5775 authored Jul 03, 2019 by Nicolas Capens Committed by Nicolas Capens Jul 04, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

SamplerCore.cpp src/Shader/SamplerCore.cpp +2 -1

No files found.
--- a/src/Shader/SamplerCore.cpp
+++ b/src/Shader/SamplerCore.cpp
@@ -506,7 +506,8 @@ namespace sw
 		for(int i = 0; i < 4; ++i)
 		{
 			Int baseLevel = *Pointer<Int>(texture + OFFSET(Texture, baseLevel));
-			Pointer<Byte> mipmap = texture + OFFSET(Texture, mipmap) + (As<Int>(Extract(lod, i)) + baseLevel) * sizeof(Mipmap);
+			Int index = Min(As<UInt>(As<Int>(Extract(lod, i)) + baseLevel), MIPMAP_LEVELS - 1);
+			Pointer<Byte> mipmap = texture + OFFSET(Texture, mipmap) + index * sizeof(Mipmap);
 			size.x = Insert(size.x, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, width)))), i);
 			size.y = Insert(size.y, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, height)))), i);
 			size.z = Insert(size.z, As<Float>(Int(*Pointer<Short>(mipmap + OFFSET(Mipmap, depth)))), i);