commit c2534f4bc37baf48d9910d3691352ff83e3bea49
author Nicolas Capens <capn@google.com> Mon Apr 04 11:13:24 2016 -0400
committer Nicolas Capens <capn@google.com> Tue Apr 05 18:36:47 2016 +0000
tree 1ef3e2a25d929d42ef4d2451fbb57f1c708dbb4c
parent 8776c5317a1104dfa71ccf99162a1b7a6b77d85a

Refactor sampler LOD calculation method into an enum.

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

src/Shader/VertexProgram.hpp

diff --git a/src/Shader/VertexProgram.hpp b/src/Shader/VertexProgram.hpp
index 1819d91..98e09cd 100644
--- a/src/Shader/VertexProgram.hpp
+++ b/src/Shader/VertexProgram.hpp
@@ -14,6 +14,7 @@
 
 #include "VertexRoutine.hpp"
 #include "ShaderCore.hpp"
+#include "SamplerCore.hpp"
 
 #include "Stream.hpp"
 #include "Types.hpp"
@@ -22,7 +23,6 @@
 {
 	struct Stream;
 	class VertexShader;
-	class SamplerCore;
 
 	class VertexProgram : public VertexRoutine, public ShaderCore
 	{
@@ -63,7 +63,7 @@
 		void program();
 		void passThrough();
 
-		Vector4f fetchRegisterF(const Src &src, unsigned int offset = 0);
+		Vector4f fetchRegister(const Src &src, unsigned int offset = 0);
 		Vector4f readConstant(const Src &src, unsigned int offset = 0);
 		RValue<Pointer<Byte>> uniformAddress(int bufferIndex, unsigned int index);
 		RValue<Pointer<Byte>> uniformAddress(int bufferIndex, unsigned int index, Int& offset);
@@ -111,7 +111,7 @@
 		void TEXGRAD(Vector4f &dst, Vector4f &src, const Src&, Vector4f &src2, Vector4f &src3, Vector4f &src4);
 		void TEXSIZE(Vector4f &dst, Float4 &lod, const Src&);
 
-		void sampleTexture(Vector4f &c, const Src &s, Float4 &u, Float4 &v, Float4 &w, Float4 &q);
+		void sampleTexture(Vector4f &c, const Src &s, Float4 &u, Float4 &v, Float4 &w, Float4 &q, SamplerMethod method);
 
 		SamplerCore *sampler[VERTEX_TEXTURE_IMAGE_UNITS];