commit 0e22d3ac1342803e4f6e99dee0b1bc7638f0acdc
author Alexis Hetu <sugoi@google.com> Wed Aug 16 13:43:33 2017 -0400
committer Alexis Hétu <sugoi@google.com> Wed Aug 16 18:35:22 2017 +0000
tree 103b69898b416b40f294fa8eb334ec88d8c447e6
parent e8d42ae19d9c8433a728fb1b1382a3ff0258926c

Implement GL_MAX_PROGRAM_TEXEL_OFFSET and GL_MAX_TEXTURE_LOD_BIAS

- GL_MAX_PROGRAM_TEXEL_OFFSET and GL_MIN_PROGRAM_TEXEL_OFFSET were
  technically already properly implemented, since the spec mentions
  that the behavior outside of these limits is undefined, and
  SwiftShader has no actual hard limit for these parameters.
- GL_MAX_TEXTURE_LOD_BIAS also has no hard limit in SwiftShader,
  other than the limit imposed on LOD itself, so that limit was
  used for GL_MAX_TEXTURE_LOD_BIAS.

Change-Id: I60b15b7f7a0febbc3e6582caff6c6a414a5d4964
Reviewed-on: https://swiftshader-review.googlesource.com/11709
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

src/Main/Config.hpp

diff --git a/src/Main/Config.hpp b/src/Main/Config.hpp
index 7a754f3..b9256ea 100644
--- a/src/Main/Config.hpp
+++ b/src/Main/Config.hpp
@@ -98,6 +98,7 @@
 		MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 64,
 		MIN_PROGRAM_TEXEL_OFFSET = -8,
 		MAX_PROGRAM_TEXEL_OFFSET = 7,
+		MAX_TEXTURE_LOD = MIPMAP_LEVELS - 2,   // Trilinear accesses lod+1
 		RENDERTARGETS = 8,
 	};
 }

src/OpenGL/libGLESv2/Context.cpp

diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
index 3cd11af..6ca3c81 100644
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
Binary files differ

src/OpenGL/libGLESv2/Context.h

diff --git a/src/OpenGL/libGLESv2/Context.h b/src/OpenGL/libGLESv2/Context.h
index 16e0aa2..d00f545 100644
--- a/src/OpenGL/libGLESv2/Context.h
+++ b/src/OpenGL/libGLESv2/Context.h
@@ -88,6 +88,7 @@
 	MAX_FRAGMENT_INPUT_VECTORS = 15,
 	MIN_PROGRAM_TEXEL_OFFSET = sw::MIN_PROGRAM_TEXEL_OFFSET,
 	MAX_PROGRAM_TEXEL_OFFSET = sw::MAX_PROGRAM_TEXEL_OFFSET,
+	MAX_TEXTURE_LOD_BIAS = sw::MAX_TEXTURE_LOD,
 	MAX_DRAW_BUFFERS = sw::RENDERTARGETS,
 	MAX_COLOR_ATTACHMENTS = MAX(MAX_DRAW_BUFFERS, 8),
 	MAX_FRAGMENT_UNIFORM_BLOCKS = sw::MAX_FRAGMENT_UNIFORM_BLOCKS,

src/Renderer/Sampler.cpp

diff --git a/src/Renderer/Sampler.cpp b/src/Renderer/Sampler.cpp
index 24734da..60f5e35 100644
--- a/src/Renderer/Sampler.cpp
+++ b/src/Renderer/Sampler.cpp
@@ -72,7 +72,7 @@
 
 		texture.baseLevel = 0;
 		texture.maxLevel = 1000;
-		texture.maxLod = MIPMAP_LEVELS - 2;	// Trilinear accesses lod+1
+		texture.maxLod = MAX_TEXTURE_LOD;
 		texture.minLod = 0;
 	}
 
@@ -344,12 +344,12 @@
 
 	void Sampler::setMinLod(float minLod)
 	{
-		texture.minLod = clamp(minLod, 0.0f, (float)(MIPMAP_LEVELS - 2));
+		texture.minLod = clamp(minLod, 0.0f, (float)(MAX_TEXTURE_LOD));
 	}
 
 	void Sampler::setMaxLod(float maxLod)
 	{
-		texture.maxLod = clamp(maxLod, 0.0f, (float)(MIPMAP_LEVELS - 2));
+		texture.maxLod = clamp(maxLod, 0.0f, (float)(MAX_TEXTURE_LOD));
 	}
 
 	void Sampler::setFilterQuality(FilterType maximumFilterQuality)