Skip to content

S
swiftshader
Commit 64750b5b by Nicolas Capens
Options

Remove unused readPixel() parameter.

Bug 22375329 Change-Id: Ifeb8017d50224b784dedd6197779c6ebfa5cf484 Reviewed-on: https://swiftshader-review.googlesource.com/3994Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 26f37224
Showing with 12 additions and 17 deletions
src/Shader/PixelRoutine.cpp
...@@ -1009,7 +1009,7 @@ namespace sw ...@@ -1009,7 +1009,7 @@ namespace sw
} }
} }
void PixelRoutine::readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x, Vector4s &pixel) void PixelRoutine::readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Int &x, Vector4s &pixel)
{ {
Short4 c01; Short4 c01;
Short4 c23; Short4 c23;
...@@ -1115,17 +1115,17 @@ namespace sw ...@@ -1115,17 +1115,17 @@ namespace sw
break; break;
case FORMAT_A8G8R8B8Q: case FORMAT_A8G8R8B8Q:
UNIMPLEMENTED(); UNIMPLEMENTED();
// pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); // 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.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.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.w = UnpackHigh(As<Byte8>(pixel.w), *Pointer<Byte8>(cBuffer + 8 * x + 8));
break; break;
case FORMAT_X8G8R8B8Q: case FORMAT_X8G8R8B8Q:
UNIMPLEMENTED(); UNIMPLEMENTED();
// pixel.z = UnpackLow(As<Byte8>(pixel.z), *Pointer<Byte8>(cBuffer + 8 * x + 0)); // 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.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.y = UnpackLow(As<Byte8>(pixel.y), *Pointer<Byte8>(cBuffer + 8 * x + 8));
// pixel.w = Short4(0xFFFFu); // pixel.w = Short4(0xFFFFu);
break; break;
case FORMAT_A16B16G16R16: case FORMAT_A16B16G16R16:
buffer = cBuffer; buffer = cBuffer;
...@@ -1168,10 +1168,7 @@ namespace sw ...@@ -1168,10 +1168,7 @@ namespace sw
} }
Vector4s pixel; Vector4s pixel;
Short4 c01; readPixel(r, index, cBuffer, x, pixel);
Short4 c23;
readPixel(r, index, cBuffer, current, x, pixel);
// Final Color = ObjectColor * SourceBlendFactor + PixelColor * DestinationBlendFactor // Final Color = ObjectColor * SourceBlendFactor + PixelColor * DestinationBlendFactor
Vector4s sourceFactor; Vector4s sourceFactor;
...@@ -1290,9 +1287,7 @@ namespace sw ...@@ -1290,9 +1287,7 @@ namespace sw
} }
Vector4s pixel; Vector4s pixel;
readPixel(r, index, cBuffer, x, pixel);
// Read pixel
readPixel(r, index, cBuffer, current, x, pixel);
switch(state.logicalOperation) switch(state.logicalOperation)
{ {
......
src/Shader/PixelRoutine.hpp
...@@ -70,7 +70,7 @@ namespace sw ...@@ -70,7 +70,7 @@ namespace sw
// Raster operations // Raster operations
void blendFactor(Registers &r, const Vector4s &blendFactor, const Vector4s &current, const Vector4s &pixel, BlendFactor blendFactorActive); void blendFactor(Registers &r, const Vector4s &blendFactor, const Vector4s &current, const Vector4s &pixel, BlendFactor blendFactorActive);
void blendFactorAlpha(Registers &r, const Vector4s &blendFactor, const Vector4s &current, const Vector4s &pixel, BlendFactor blendFactorAlphaActive); void blendFactorAlpha(Registers &r, const Vector4s &blendFactor, const Vector4s &current, const Vector4s &pixel, BlendFactor blendFactorAlphaActive);
void readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x, Vector4s &pixel); void readPixel(Registers &r, int index, Pointer<Byte> &cBuffer, Int &x, Vector4s &pixel);
void alphaBlend(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x); void alphaBlend(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x);
void logicOperation(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x); void logicOperation(Registers &r, int index, Pointer<Byte> &cBuffer, Vector4s &current, Int &x);
void writeColor(Registers &r, int index, Pointer<Byte> &cBuffer, Int &i, Vector4s &current, Int &sMask, Int &zMask, Int &cMask); void writeColor(Registers &r, int index, Pointer<Byte> &cBuffer, Int &i, Vector4s &current, Int &sMask, Int &zMask, Int &cMask);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment