We now pass pDawContext as a default parameter
---
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp | 12 ++++++------
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
index c8ba5b4..c298c7f 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
@@ -222,7 +222,7 @@ namespace SwrJit
/// @param vIndices - SIMD wide value of VB byte offsets
/// @param vMask - SIMD wide mask that controls whether to access memory
or the src values
/// @param scale - value to scale indices by
- Value *Builder::GATHERDD(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask, uint8_t scale)
+ Value *Builder::GATHERDD(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask, uint8_t scale, Value *pDrawContext)
{
Value* vGather;
@@ -346,21 +346,21 @@ namespace SwrJit
}
void Builder::Gather4(const SWR_FORMAT format, Value* pSrcBase, Value*
byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput)
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext)
{
const SWR_FORMAT_INFO &info = GetFormatInfo(format);
if (info.type[0] == SWR_TYPE_FLOAT && info.bpc[0] == 32)
{
- GATHER4PS(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput);
+ GATHER4PS(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput, pDrawContext);
}
else
{
- GATHER4DD(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput);
+ GATHER4DD(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput, pDrawContext);
}
}
void Builder::GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase,
Value* byteOffsets,
- Value* vMask, Value* vGatherComponents[], bool bPackedOutput)
+ Value* vMask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext)
{
switch (info.bpp / info.numComps)
{
@@ -427,7 +427,7 @@ namespace SwrJit
}
void Builder::GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase,
Value* byteOffsets,
- Value* vMask, Value* vGatherComponents[], bool bPackedOutput)
+ Value* vMask, Value* vGatherComponents[], bool bPackedOutput, Value*
pDrawContext)
{
switch (info.bpp / info.numComps)
{
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
index 6264f39..7813b7d 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
@@ -42,19 +42,19 @@ StoreInst *STOREV(Value *Val, Value *BasePtr, const
std::initializer_list<Value*
Value *MASKLOADD(Value* src, Value* mask);
void Gather4(const SWR_FORMAT format, Value* pSrcBase, Value* byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput);
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext = nullptr);
virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1, Value *pDrawContext = nullptr);
Value *GATHERPS_16(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1);
void GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput);
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext = nullptr);
-Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask, uint8_t
scale = 1);
+virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask,
uint8_t scale = 1, Value *pDrawContext = nullptr);
Value *GATHERDD_16(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1);
-void GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput);
+virtual void GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext = nullptr);
Value *GATHERPD(Value* src, Value* pBase, Value* indices, Value* mask, uint8_t
scale = 1);
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
