Move mpPrivateContext to compensate
---
src/gallium/drivers/swr/rasterizer/jitter/builder.h | 4 ++++
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp | 14 +++++++-------
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h | 10 +++++-----
src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp | 3 +--
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder.h
index 5d1a6b9..788c5b2 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder.h
@@ -95,5 +95,9 @@ namespace SwrJit
#include "builder_misc.h"
#include "builder_math.h"
#include "builder_mem.h"
+
+ protected:
+ Value* mpPrivateContext;
+
};
}
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
index c298c7f..98d4354 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
@@ -137,7 +137,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::GATHERPS(Value *vSrc, Value *pBase, Value *vIndices, Value
*vMask, uint8_t scale, Value *pDrawContext)
+ Value *Builder::GATHERPS(Value *vSrc, Value *pBase, Value *vIndices, Value
*vMask, uint8_t scale)
{
Value *vGather;
@@ -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 *pDrawContext)
+ Value *Builder::GATHERDD(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask, uint8_t scale)
{
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
*pDrawContext)
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput)
{
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, pDrawContext);
+ GATHER4PS(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput);
}
else
{
- GATHER4DD(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput, pDrawContext);
+ GATHER4DD(info, pSrcBase, byteOffsets, mask, vGatherComponents,
bPackedOutput);
}
}
void Builder::GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase,
Value* byteOffsets,
- Value* vMask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext)
+ Value* vMask, Value* vGatherComponents[], bool bPackedOutput)
{
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*
pDrawContext)
+ Value* vMask, Value* vGatherComponents[], bool bPackedOutput)
{
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 7813b7d..88ea37f 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
*pDrawContext = nullptr);
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput);
-virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1, Value *pDrawContext = nullptr);
+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);
void GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext = nullptr);
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput);
-virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask,
uint8_t scale = 1, Value *pDrawContext = nullptr);
+virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask,
uint8_t scale = 1);
Value *GATHERDD_16(Value *src, Value *pBase, Value *indices, Value *mask,
uint8_t scale = 1);
virtual void GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value*
byteOffsets,
- Value* mask, Value* vGatherComponents[], bool bPackedOutput, Value
*pDrawContext = nullptr);
+ Value* mask, Value* vGatherComponents[], bool bPackedOutput);
Value *GATHERPD(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 c6b3e84..4f56bda 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
@@ -130,7 +130,6 @@ struct FetchJit :
void CreateGatherOddFormats(SWR_FORMAT format, Value* pMask, Value* pBase,
Value* offsets, Value* result[4]);
void ConvertFormat(SWR_FORMAT format, Value *texels[4]);
- Value* mpPrivateContext;
Value* mpFetchInfo;
};
@@ -1364,7 +1363,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 *vShiftedOffsets = LSHR(vOffsets, 1);
- vVertexElements[currentVertexElement++] =
GATHERPS(gatherSrc, pStreamBase, vShiftedOffsets, vGatherMask, 2,
mpPrivateContext);
+ vVertexElements[currentVertexElement++] =
GATHERPS(gatherSrc, pStreamBase, vShiftedOffsets, vGatherMask, 2);
}
else
{
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
