Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate enums in SAMPLER_STATE command 

Remove:
- tagTCZ_ADDRESS_CONTROL_MODE
- tagTCY_ADDRESS_CONTROL_MODE
- tagTCX_ADDRESS_CONTROL_MODE
Replace:
- tagTEXTURE_COORDINATE_MODE

Change-Id: I26fb654628360f107378c7bdd531951f196c35cf
Signed-off-by: Krzysztof Gibala <krzysztof.gibala@intel.com>
This commit is contained in:
Krzysztof Gibala 2019-09-06 14:19:02 +02:00 committed by sys_ocldev
parent b261679218
commit c100db4333
5 changed files with 101 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
core/gen11/hw_cmds_generated.inl
View File

@ -3151,36 +3151,16 @@ typedef struct tagSAMPLER_STATE {
RETURN_FILTER_WEIGHT_FOR_BORDER_TEXELS_DISABLE = 0x0,
RETURN_FILTER_WEIGHT_FOR_BORDER_TEXELS_ENABLE = 0x1,
} RETURN_FILTER_WEIGHT_FOR_BORDER_TEXELS;
typedef enum tagTCZ_ADDRESS_CONTROL_MODE {
TCZ_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCZ_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCZ_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCZ_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCZ_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCZ_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCZ_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
TCZ_ADDRESS_CONTROL_MODE_MIRROR_101 = 0x7,
} TCZ_ADDRESS_CONTROL_MODE;
typedef enum tagTCY_ADDRESS_CONTROL_MODE {
TCY_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCY_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCY_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCY_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCY_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCY_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCY_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
TCY_ADDRESS_CONTROL_MODE_MIRROR_101 = 0x7,
} TCY_ADDRESS_CONTROL_MODE;
typedef enum tagTCX_ADDRESS_CONTROL_MODE {
TCX_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCX_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCX_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCX_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCX_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCX_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCX_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
TCX_ADDRESS_CONTROL_MODE_MIRROR_101 = 0x7,
} TCX_ADDRESS_CONTROL_MODE;
typedef enum tagTEXTURE_COORDINATE_MODE {
TEXTURE_COORDINATE_MODE_WRAP = 0x0,
TEXTURE_COORDINATE_MODE_MIRROR = 0x1,
TEXTURE_COORDINATE_MODE_CLAMP = 0x2,
TEXTURE_COORDINATE_MODE_CUBE = 0x3,
TEXTURE_COORDINATE_MODE_CLAMP_BORDER = 0x4,
TEXTURE_COORDINATE_MODE_MIRROR_ONCE = 0x5,
TEXTURE_COORDINATE_MODE_HALF_BORDER = 0x6,
TEXTURE_COORDINATE_MODE_MIRROR_101 = 0x7,
} TEXTURE_COORDINATE_MODE;
typedef enum tagTRILINEAR_FILTER_QUALITY {
TRILINEAR_FILTER_QUALITY_FULL = 0x0,
TRILINEAR_FILTER_QUALITY_TRIQUAL_HIGH_MAG_CLAMP_MIPFILTER = 0x1,
@ -3219,9 +3199,9 @@ typedef struct tagSAMPLER_STATE {
TheStructure.Common.SrgbDecode = SRGB_DECODE_DECODE_EXT;
TheStructure.Common.ReturnFilterWeightForNullTexels = RETURN_FILTER_WEIGHT_FOR_NULL_TEXELS_DISABLE;
TheStructure.Common.ReturnFilterWeightForBorderTexels = RETURN_FILTER_WEIGHT_FOR_BORDER_TEXELS_DISABLE;
TheStructure.Common.TczAddressControlMode = TCZ_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TCY_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TCX_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TczAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TrilinearFilterQuality = TRILINEAR_FILTER_QUALITY_FULL;
TheStructure.Common.MaximumAnisotropy = MAXIMUM_ANISOTROPY_RATIO_21;
TheStructure.Common.ReductionType = REDUCTION_TYPE_STD_FILTER;
@ -3372,23 +3352,23 @@ typedef struct tagSAMPLER_STATE {
inline uint32_t getIndirectStatePointer(void) const {
return (TheStructure.Common.IndirectStatePointer << INDIRECTSTATEPOINTER_BIT_SHIFT);
}
inline void setTczAddressControlMode(const TCZ_ADDRESS_CONTROL_MODE value) {
inline void setTczAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TczAddressControlMode = value;
}
inline TCZ_ADDRESS_CONTROL_MODE getTczAddressControlMode(void) const {
return static_cast<TCZ_ADDRESS_CONTROL_MODE>(TheStructure.Common.TczAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTczAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TczAddressControlMode);
}
inline void setTcyAddressControlMode(const TCY_ADDRESS_CONTROL_MODE value) {
inline void setTcyAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcyAddressControlMode = value;
}
inline TCY_ADDRESS_CONTROL_MODE getTcyAddressControlMode(void) const {
return static_cast<TCY_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcyAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcyAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcyAddressControlMode);
}
inline void setTcxAddressControlMode(const TCX_ADDRESS_CONTROL_MODE value) {
inline void setTcxAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcxAddressControlMode = value;
}
inline TCX_ADDRESS_CONTROL_MODE getTcxAddressControlMode(void) const {
return static_cast<TCX_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcxAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcxAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcxAddressControlMode);
}
inline void setReductionTypeEnable(const bool value) {
TheStructure.Common.ReductionTypeEnable = value;

61
core/gen8/hw_cmds_generated.inl
View File

@ -2993,33 +2993,16 @@ typedef struct tagSAMPLER_STATE {
LOD_CLAMP_MAGNIFICATION_MODE_MIPNONE = 0x0,
LOD_CLAMP_MAGNIFICATION_MODE_MIPFILTER = 0x1,
} LOD_CLAMP_MAGNIFICATION_MODE;
typedef enum tagTCZ_ADDRESS_CONTROL_MODE {
TCZ_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCZ_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCZ_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCZ_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCZ_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCZ_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCZ_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCZ_ADDRESS_CONTROL_MODE;
typedef enum tagTCY_ADDRESS_CONTROL_MODE {
TCY_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCY_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCY_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCY_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCY_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCY_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCY_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCY_ADDRESS_CONTROL_MODE;
typedef enum tagTCX_ADDRESS_CONTROL_MODE {
TCX_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCX_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCX_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCX_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCX_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCX_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCX_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCX_ADDRESS_CONTROL_MODE;
typedef enum tagTEXTURE_COORDINATE_MODE {
TEXTURE_COORDINATE_MODE_WRAP = 0x0,
TEXTURE_COORDINATE_MODE_MIRROR = 0x1,
TEXTURE_COORDINATE_MODE_CLAMP = 0x2,
TEXTURE_COORDINATE_MODE_CUBE = 0x3,
TEXTURE_COORDINATE_MODE_CLAMP_BORDER = 0x4,
TEXTURE_COORDINATE_MODE_MIRROR_ONCE = 0x5,
TEXTURE_COORDINATE_MODE_HALF_BORDER = 0x6,
TEXTURE_COORDINATE_MODE_MIRROR_101 = 0x7,
} TEXTURE_COORDINATE_MODE;
typedef enum tagTRILINEAR_FILTER_QUALITY {
TRILINEAR_FILTER_QUALITY_FULL = 0x0,
TRILINEAR_FILTER_QUALITY_TRIQUAL_HIGH_MAG_CLAMP_MIPFILTER = 0x1,
@ -3048,9 +3031,9 @@ typedef struct tagSAMPLER_STATE {
TheStructure.Common.ShadowFunction = SHADOW_FUNCTION_PREFILTEROP_ALWAYS;
TheStructure.Common.ChromakeyMode = CHROMAKEY_MODE_KEYFILTER_KILL_ON_ANY_MATCH;
TheStructure.Common.LodClampMagnificationMode = LOD_CLAMP_MAGNIFICATION_MODE_MIPNONE;
TheStructure.Common.TczAddressControlMode = TCZ_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TCY_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TCX_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TczAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TrilinearFilterQuality = TRILINEAR_FILTER_QUALITY_FULL;
TheStructure.Common.MaximumAnisotropy = MAXIMUM_ANISOTROPY_RATIO_21;
}
@ -3175,23 +3158,23 @@ typedef struct tagSAMPLER_STATE {
inline void setIndirectStatePointer(const uint32_t indirectStatePointerValue) {
TheStructure.Common.IndirectStatePointer = indirectStatePointerValue >> INDIRECTSTATEPOINTER_BIT_SHIFT;
}
inline void setTczAddressControlMode(const TCZ_ADDRESS_CONTROL_MODE value) {
inline void setTczAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TczAddressControlMode = value;
}
inline TCZ_ADDRESS_CONTROL_MODE getTczAddressControlMode(void) const {
return static_cast<TCZ_ADDRESS_CONTROL_MODE>(TheStructure.Common.TczAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTczAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TczAddressControlMode);
}
inline void setTcyAddressControlMode(const TCY_ADDRESS_CONTROL_MODE value) {
inline void setTcyAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcyAddressControlMode = value;
}
inline TCY_ADDRESS_CONTROL_MODE getTcyAddressControlMode(void) const {
return static_cast<TCY_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcyAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcyAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcyAddressControlMode);
}
inline void setTcxAddressControlMode(const TCX_ADDRESS_CONTROL_MODE value) {
inline void setTcxAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcxAddressControlMode = value;
}
inline TCX_ADDRESS_CONTROL_MODE getTcxAddressControlMode(void) const {
return static_cast<TCX_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcxAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcxAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcxAddressControlMode);
}
inline void setNonNormalizedCoordinateEnable(const bool value) {
TheStructure.Common.Non_NormalizedCoordinateEnable = value;

61
core/gen9/hw_cmds_generated.inl
View File

@ -3098,33 +3098,16 @@ typedef struct tagSAMPLER_STATE {
LOD_CLAMP_MAGNIFICATION_MODE_MIPNONE = 0x0,
LOD_CLAMP_MAGNIFICATION_MODE_MIPFILTER = 0x1,
} LOD_CLAMP_MAGNIFICATION_MODE;
typedef enum tagTCZ_ADDRESS_CONTROL_MODE {
TCZ_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCZ_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCZ_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCZ_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCZ_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCZ_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCZ_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCZ_ADDRESS_CONTROL_MODE;
typedef enum tagTCY_ADDRESS_CONTROL_MODE {
TCY_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCY_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCY_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCY_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCY_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCY_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCY_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCY_ADDRESS_CONTROL_MODE;
typedef enum tagTCX_ADDRESS_CONTROL_MODE {
TCX_ADDRESS_CONTROL_MODE_WRAP = 0x0,
TCX_ADDRESS_CONTROL_MODE_MIRROR = 0x1,
TCX_ADDRESS_CONTROL_MODE_CLAMP = 0x2,
TCX_ADDRESS_CONTROL_MODE_CUBE = 0x3,
TCX_ADDRESS_CONTROL_MODE_CLAMP_BORDER = 0x4,
TCX_ADDRESS_CONTROL_MODE_MIRROR_ONCE = 0x5,
TCX_ADDRESS_CONTROL_MODE_HALF_BORDER = 0x6,
} TCX_ADDRESS_CONTROL_MODE;
typedef enum tagTEXTURE_COORDINATE_MODE {
TEXTURE_COORDINATE_MODE_WRAP = 0x0,
TEXTURE_COORDINATE_MODE_MIRROR = 0x1,
TEXTURE_COORDINATE_MODE_CLAMP = 0x2,
TEXTURE_COORDINATE_MODE_CUBE = 0x3,
TEXTURE_COORDINATE_MODE_CLAMP_BORDER = 0x4,
TEXTURE_COORDINATE_MODE_MIRROR_ONCE = 0x5,
TEXTURE_COORDINATE_MODE_HALF_BORDER = 0x6,
TEXTURE_COORDINATE_MODE_MIRROR_101 = 0x7,
} TEXTURE_COORDINATE_MODE;
typedef enum tagTRILINEAR_FILTER_QUALITY {
TRILINEAR_FILTER_QUALITY_FULL = 0x0,
TRILINEAR_FILTER_QUALITY_TRIQUAL_HIGH_MAG_CLAMP_MIPFILTER = 0x1,
@ -3160,9 +3143,9 @@ typedef struct tagSAMPLER_STATE {
TheStructure.Common.ShadowFunction = SHADOW_FUNCTION_PREFILTEROP_ALWAYS;
TheStructure.Common.ChromakeyMode = CHROMAKEY_MODE_KEYFILTER_KILL_ON_ANY_MATCH;
TheStructure.Common.LodClampMagnificationMode = LOD_CLAMP_MAGNIFICATION_MODE_MIPNONE;
TheStructure.Common.TczAddressControlMode = TCZ_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TCY_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TCX_ADDRESS_CONTROL_MODE_WRAP;
TheStructure.Common.TczAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcyAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TcxAddressControlMode = TEXTURE_COORDINATE_MODE_WRAP;
TheStructure.Common.TrilinearFilterQuality = TRILINEAR_FILTER_QUALITY_FULL;
TheStructure.Common.MaximumAnisotropy = MAXIMUM_ANISOTROPY_RATIO_21;
TheStructure.Common.ReductionType = REDUCTION_TYPE_STD_FILTER;
@ -3288,23 +3271,23 @@ typedef struct tagSAMPLER_STATE {
inline void setIndirectStatePointer(const uint32_t indirectStatePointerValue) {
TheStructure.Common.IndirectStatePointer = indirectStatePointerValue >> INDIRECTSTATEPOINTER_BIT_SHIFT;
}
inline void setTczAddressControlMode(const TCZ_ADDRESS_CONTROL_MODE value) {
inline void setTczAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TczAddressControlMode = value;
}
inline TCZ_ADDRESS_CONTROL_MODE getTczAddressControlMode(void) const {
return static_cast<TCZ_ADDRESS_CONTROL_MODE>(TheStructure.Common.TczAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTczAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TczAddressControlMode);
}
inline void setTcyAddressControlMode(const TCY_ADDRESS_CONTROL_MODE value) {
inline void setTcyAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcyAddressControlMode = value;
}
inline TCY_ADDRESS_CONTROL_MODE getTcyAddressControlMode(void) const {
return static_cast<TCY_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcyAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcyAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcyAddressControlMode);
}
inline void setTcxAddressControlMode(const TCX_ADDRESS_CONTROL_MODE value) {
inline void setTcxAddressControlMode(const TEXTURE_COORDINATE_MODE value) {
TheStructure.Common.TcxAddressControlMode = value;
}
inline TCX_ADDRESS_CONTROL_MODE getTcxAddressControlMode(void) const {
return static_cast<TCX_ADDRESS_CONTROL_MODE>(TheStructure.Common.TcxAddressControlMode);
inline TEXTURE_COORDINATE_MODE getTcxAddressControlMode(void) const {
return static_cast<TEXTURE_COORDINATE_MODE>(TheStructure.Common.TcxAddressControlMode);
}
inline void setReductionTypeEnable(const bool value) {
TheStructure.Common.ReductionTypeEnable = value;

36
runtime/sampler/sampler.inl
View File

@ -17,35 +17,33 @@ void SamplerHw<GfxFamily>::setArg(void *memory) {
auto samplerState = reinterpret_cast<SAMPLER_STATE *>(memory);
samplerState->setNonNormalizedCoordinateEnable(!this->normalizedCoordinates);
auto addressControlModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_CLAMP;
auto addressControlModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_CLAMP;
auto addressControlModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_CLAMP;
auto addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
auto addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
auto addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
// clang-format off
switch (this->addressingMode) {
case CL_ADDRESS_NONE:
case CL_ADDRESS_NONE:
case CL_ADDRESS_CLAMP:
addressControlModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
addressControlModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
addressControlModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
break;
case CL_ADDRESS_CLAMP_TO_EDGE:
addressControlModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_CLAMP;
addressControlModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_CLAMP;
addressControlModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_CLAMP;
addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
break;
case CL_ADDRESS_MIRRORED_REPEAT:
addressControlModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_MIRROR;
addressControlModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_MIRROR;
addressControlModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_MIRROR;
case CL_ADDRESS_MIRRORED_REPEAT:
addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
break;
case CL_ADDRESS_REPEAT:
addressControlModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_WRAP;
addressControlModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_WRAP;
addressControlModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_WRAP;
addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
break;
}
// clang-format on
auto minMode = SAMPLER_STATE::MIN_MODE_FILTER_NEAREST;
auto magMode = SAMPLER_STATE::MAG_MODE_FILTER_NEAREST;

36
unit_tests/sampler/sampler_set_arg_tests.cpp
View File

@ -127,9 +127,9 @@ HWTEST_F(SamplerSetArgTest, clSetKernelArgSampler) {
ptrOffset(pKernel->getDynamicStateHeap(),
pKernelInfo->kernelArgInfo[0].offsetHeap));
EXPECT_EQ(static_cast<cl_bool>(CL_TRUE), static_cast<cl_bool>(!samplerState->getNonNormalizedCoordinateEnable()));
EXPECT_EQ(SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_MIRROR, samplerState->getTcxAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_MIRROR, samplerState->getTcyAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_MIRROR, samplerState->getTczAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR, samplerState->getTcxAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR, samplerState->getTcyAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR, samplerState->getTczAddressControlMode());
EXPECT_EQ(SAMPLER_STATE::MIN_MODE_FILTER_NEAREST, samplerState->getMinModeFilter());
EXPECT_EQ(SAMPLER_STATE::MAG_MODE_FILTER_NEAREST, samplerState->getMagModeFilter());
EXPECT_EQ(SAMPLER_STATE::MIP_MODE_FILTER_NEAREST, samplerState->getMipModeFilter());
@ -478,32 +478,32 @@ HWTEST_P(AddressingModeTest, setKernelArgSampler) {
ptrOffset(pKernel->getDynamicStateHeap(),
pKernelInfo->kernelArgInfo[0].offsetHeap));
auto expectedModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_MIRROR;
auto expectedModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_MIRROR;
auto expectedModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_MIRROR;
auto expectedModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
auto expectedModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
auto expectedModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
// clang-format off
switch (addressingMode) {
case CL_ADDRESS_NONE:
case CL_ADDRESS_CLAMP:
expectedModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
expectedModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
expectedModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_CLAMP_BORDER;
expectedModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
expectedModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
expectedModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER;
break;
case CL_ADDRESS_CLAMP_TO_EDGE:
expectedModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_CLAMP;
expectedModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_CLAMP;
expectedModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_CLAMP;
expectedModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
expectedModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
expectedModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
break;
case CL_ADDRESS_MIRRORED_REPEAT:
expectedModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_MIRROR;
expectedModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_MIRROR;
expectedModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_MIRROR;
expectedModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
expectedModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
expectedModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
break;
case CL_ADDRESS_REPEAT:
expectedModeX = SAMPLER_STATE::TCX_ADDRESS_CONTROL_MODE_WRAP;
expectedModeY = SAMPLER_STATE::TCY_ADDRESS_CONTROL_MODE_WRAP;
expectedModeZ = SAMPLER_STATE::TCZ_ADDRESS_CONTROL_MODE_WRAP;
expectedModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
expectedModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
expectedModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP;
break;
}
// clang-format on