commit 25ec7b0cd393f08c41f35fbf86c65d7828759b8c
author Alexis Hetu <sugoi@google.com> Tue Mar 12 14:19:22 2019 -0400
committer Alexis Hétu <sugoi@google.com> Wed Mar 13 12:09:48 2019 +0000
tree 7d6ff2592c2ea00b32392d3c067c17c93f2f5d3f
parent 1407297b7f7d5ca4730d6ab46ec78c14d1ebb36d

Removed references to sw::Surface

Removed sw::Surface dependency from:
- Blitter
- Context
- PixelProcessor
- PixelRoutine
- Renderer
- VkFramebuffer

No behavior changes should be happen with this cl.

Bug b/126883332

Change-Id: I4146f043ba8e5008eb3d44465c26a0f34a2e1acc
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26969
Tested-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>

src/Pipeline/PixelRoutine.cpp

diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index 6c528d9..aa4209e 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -18,7 +18,6 @@
 #include "Constants.hpp"
 #include "Device/Renderer.hpp"
 #include "Device/QuadRasterizer.hpp"
-#include "Device/Surface.hpp"
 #include "Device/Primitive.hpp"
 #include "Vulkan/VkDebug.hpp"
 
@@ -988,7 +987,7 @@
 
 	bool PixelRoutine::isSRGB(int index) const
 	{
-		return Surface::isSRGBformat(state.targetFormat[index]);
+		return vk::Format(state.targetFormat[index]).isSRGBformat();
 	}
 
 	void PixelRoutine::readPixel(int index, Pointer<Byte> &cBuffer, Int &x, Vector4s &pixel)
@@ -1787,13 +1786,14 @@
 		Short4 c23;
 
 		Float4 one;
-		if(Surface::isFloatFormat(state.targetFormat[index]))
+		vk::Format format(state.targetFormat[index]);
+		if(format.isFloatFormat())
 		{
 			one = Float4(1.0f);
 		}
-		else if(Surface::isNonNormalizedInteger(state.targetFormat[index]))
+		else if(format.isNonNormalizedInteger())
 		{
-			one = As<Float4>(Surface::isUnsignedComponent(state.targetFormat[index], 0) ? Int4(0xFFFFFFFF) : Int4(0x7FFFFFFF));
+			one = As<Float4>(format.isUnsignedComponent(0) ? Int4(0xFFFFFFFF) : Int4(0x7FFFFFFF));
 		}
 
 		switch(state.targetFormat[index])