---
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h | 3 ++-
src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
index b3a0e2b..a50ecc0 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
@@ -52,9 +52,10 @@ void Gather4(const SWR_FORMAT format, Value* pSrcBase,
Value* byteOffsets,
virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant *offset);
virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1);
+
Value *GATHERPS_16(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1);
-virtual void GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
+void GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
Value* mask, Value* vGatherComponents[], bool bPackedOutput);
virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask,
uint8_t scale = 1);
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
index f1dc002..2ffce1b 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
@@ -1333,7 +1333,7 @@ void FetchJit::JitGatherVertices(const
FETCH_COMPILE_STATE &fetchState,
// But, we know that elements must be aligned
for FETCH. :)
// Right shift the offset by a bit and then
scale by 2 to remove the sign extension.
Value *shiftedOffsets16 = LSHR(vOffsets16, 1);
- pVtxSrc2[currentVertexElement++] =
GATHERPS_16(gatherSrc16, pStreamBase, shiftedOffsets16, vGatherMask16, 2);
+ pVtxSrc2[currentVertexElement++] =
GATHERPS_16(gatherSrc16, pStreamBaseGFX, shiftedOffsets16, vGatherMask16, 2);
}
else
{
@@ -1350,9 +1350,6 @@ void FetchJit::JitGatherVertices(const
FETCH_COMPILE_STATE &fetchState,
currentVertexElement = 0;
}
}
-
- // offset base to the next component in the vertex to
gather
- pStreamBase = GEP(pStreamBase, C((char)4));
#else
if (isComponentEnabled(compMask, i))
{
@@ -1383,11 +1380,11 @@ void FetchJit::JitGatherVertices(const
FETCH_COMPILE_STATE &fetchState,
currentVertexElement = 0;
}
}
+#endif
// offset base to the next component in the vertex to
gather
pStreamBase = GEP(pStreamBase, C((char)4));
pStreamBaseGFX = ADD(pStreamBaseGFX, C((int64_t)4));
-#endif
}
}
break;
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
