commit 8dd53abf0ceb7d461ec3c8c5d72edf354e671070
author Nicolas Capens <capn@google.com> Mon Jul 25 12:11:29 2022 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Jul 29 04:20:18 2022 +0000
tree e5555c35a11114db941e7e4c64bc9e8b6b5eb4c0
parent e8c074d7684b22c7981f76ff818e64294733ed2d

Rename getDepthValue to readDepth

getDepthValue does not indicate whether it obtains the interpolated
depth value or the depth buffer's value. readDepth can only mean the
latter, and makes things symmetrical with the existing writeDepth
methods.

Bug: b/204919030
Change-Id: I2d07e3d866b96c5dc2612ece1a62ffee6cf612af
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/67148
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Sean Risser <srisser@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

src/Pipeline/PixelRoutine.cpp

diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 5c499e2..4e1e827 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -419,7 +419,7 @@
 	}
 }
 
-SIMD::Float PixelRoutine::getDepthValue32F(const Pointer<Byte> &zBuffer, int q, const Int &x) const
+SIMD::Float PixelRoutine::readDepth32F(const Pointer<Byte> &zBuffer, int q, const Int &x) const
 {
 	ASSERT(SIMD::Width == 4);
 	Pointer<Byte> buffer = zBuffer + 4 * x;
@@ -434,7 +434,7 @@
 	return SIMD::Float(zValue);
 }
 
-SIMD::Float PixelRoutine::getDepthValue16(const Pointer<Byte> &zBuffer, int q, const Int &x) const
+SIMD::Float PixelRoutine::readDepth16(const Pointer<Byte> &zBuffer, int q, const Int &x) const
 {
 	ASSERT(SIMD::Width == 4);
 	Pointer<Byte> buffer = zBuffer + 2 * x;
@@ -478,12 +478,12 @@
 		{
 		case VK_FORMAT_D16_UNORM:
 			Z = Min(Max(Round(z * 0xFFFF), 0.0f), 0xFFFF);
-			zValue = getDepthValue16(zBuffer, q, x);
+			zValue = readDepth16(zBuffer, q, x);
 			break;
 		case VK_FORMAT_D32_SFLOAT:
 		case VK_FORMAT_D32_SFLOAT_S8_UINT:
 			Z = z;
-			zValue = getDepthValue32F(zBuffer, q, x);
+			zValue = readDepth32F(zBuffer, q, x);
 			break;
 		default:
 			UNSUPPORTED("Depth format: %d", int(state.depthFormat));

src/Pipeline/PixelRoutine.hpp

diff --git a/src/Pipeline/PixelRoutine.hpp b/src/Pipeline/PixelRoutine.hpp
index fde0011..c4effab 100644
--- a/src/Pipeline/PixelRoutine.hpp
+++ b/src/Pipeline/PixelRoutine.hpp
@@ -105,8 +105,8 @@
 	void linearToSRGB16_12_16(Vector4s &c);
 	Float4 sRGBtoLinear(const Float4 &x);
 
-	SIMD::Float getDepthValue32F(const Pointer<Byte> &zBuffer, int q, const Int &x) const;
-	SIMD::Float getDepthValue16(const Pointer<Byte> &zBuffer, int q, const Int &x) const;
+	SIMD::Float readDepth32F(const Pointer<Byte> &zBuffer, int q, const Int &x) const;
+	SIMD::Float readDepth16(const Pointer<Byte> &zBuffer, int q, const Int &x) const;
 
 	void writeDepth32F(Pointer<Byte> &zBuffer, int q, const Int &x, const Float4 &z, const Int &zMask);
 	void writeDepth16(Pointer<Byte> &zBuffer, int q, const Int &x, const Float4 &z, const Int &zMask);