Remove unused readPixel() parameter. Bug 22375329 Change-Id: Ifeb8017d50224b784dedd6197779c6ebfa5cf484 Reviewed-on: https://swiftshader-review.googlesource.com/3994 Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Shader/PixelRoutine.cpp b/src/Shader/PixelRoutine.cpp index 389b7f3..52f9038 100644 --- a/src/Shader/PixelRoutine.cpp +++ b/src/Shader/PixelRoutine.cpp
@@ -1009,7 +1009,7 @@ } } - void PixelRoutine::readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s ¤t, Int &x, Vector4s &pixel) + void PixelRoutine::readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Int &x, Vector4s &pixel) { Short4 c01; Short4 c23; @@ -1115,17 +1115,17 @@ break; case FORMAT_A8G8R8B8Q: UNIMPLEMENTED(); - // pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); - // pixel.x = UnpackHigh(As<Byte8>(pixel.x), *Pointer<Byte8>(cBuffer + 8 * x + 0)); - // pixel.y = UnpackLow(As<Byte8>(pixel.y), *Pointer<Byte8>(cBuffer + 8 * x + 8)); - // pixel.w = UnpackHigh(As<Byte8>(pixel.w), *Pointer<Byte8>(cBuffer + 8 * x + 8)); + // pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); + // pixel.x = UnpackHigh(As<Byte8>(pixel.x), *Pointer<Byte8>(cBuffer + 8 * x + 0)); + // pixel.y = UnpackLow(As<Byte8>(pixel.y), *Pointer<Byte8>(cBuffer + 8 * x + 8)); + // pixel.w = UnpackHigh(As<Byte8>(pixel.w), *Pointer<Byte8>(cBuffer + 8 * x + 8)); break; case FORMAT_X8G8R8B8Q: UNIMPLEMENTED(); - // pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); - // pixel.x = UnpackHigh(As<Byte8>(pixel.x), *Pointer<Byte8>(cBuffer + 8 * x + 0)); - // pixel.y = UnpackLow(As<Byte8>(pixel.y), *Pointer<Byte8>(cBuffer + 8 * x + 8)); - // pixel.w = Short4(0xFFFFu); + // pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); + // pixel.x = UnpackHigh(As<Byte8>(pixel.x), *Pointer<Byte8>(cBuffer + 8 * x + 0)); + // pixel.y = UnpackLow(As<Byte8>(pixel.y), *Pointer<Byte8>(cBuffer + 8 * x + 8)); + // pixel.w = Short4(0xFFFFu); break; case FORMAT_A16B16G16R16: buffer = cBuffer; @@ -1168,10 +1168,7 @@ } Vector4s pixel; - Short4 c01; - Short4 c23; - - readPixel(r, index, cBuffer, current, x, pixel); + readPixel(r, index, cBuffer, x, pixel); // Final Color = ObjectColor * SourceBlendFactor + PixelColor * DestinationBlendFactor Vector4s sourceFactor; @@ -1290,9 +1287,7 @@ } Vector4s pixel; - - // Read pixel - readPixel(r, index, cBuffer, current, x, pixel); + readPixel(r, index, cBuffer, x, pixel); switch(state.logicalOperation) {