Refactor texture pixel upload offsets.

Apply xoffset, yoffset, and zoffset at image buffer lock so we don't have to pass them down to the row loading functions as parameters. Change-Id: I055549c80b1b207df4c49f6f59ecfb8286736040 Reviewed-on: https://swiftshader-review.googlesource.com/17068Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Refactor texture pixel upload offsets.
027714e7 · Nicolas Capens · Nicolas Capens · eab70768 · 027714e7 · 027714e7
Commit 027714e7 authored Feb 06, 2018 by Nicolas Capens Committed by Nicolas Capens Feb 07, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Image.cpp src/OpenGL/common/Image.cpp +0 -0

Image.hpp src/OpenGL/common/Image.hpp +4 -4

No files found.
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -147,9 +147,9 @@ public:
 		shared = true;
 	}

-	virtual void *lock(unsigned int left, unsigned int top, sw::Lock lock)
+	virtual void *lock(int x, int y, int z, sw::Lock lock)
 	{
-		return lockExternal(left, top, 0, lock, sw::PUBLIC);
+		return lockExternal(x, y, z, lock, sw::PUBLIC);
 	}

 	unsigned int getPitch() const
@@ -325,10 +325,10 @@ private:
 		sw::Surface::unlockInternal();
 	}

-	void *lock(unsigned int left, unsigned int top, sw::Lock lock) override
+	void *lock(int x, int y, int z, sw::Lock lock) override
 	{
 		LOGLOCK("image=%p op=%s lock=%d", this, __FUNCTION__, lock);
-		(void)sw::Surface::lockExternal(left, top, 0, lock, sw::PUBLIC);
+		(void)sw::Surface::lockExternal(x, y, z, lock, sw::PUBLIC);

 		return lockNativeBuffer(GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN);
 	}