Skip to content

Commit dcbbaf4

Browse files
kchen1024intel-mediadev
kchen1024
authored and
intel-mediadev
committed
[VP] Rename L0 to OCL for 3DLut
(1) rename related files (2) enable feature to all build instead of release internal only
1 parent a233941 commit dcbbaf4

20 files changed

+432
-67
lines changed

‎media_common/agnostic/common/vp/hal/vp_common_defs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ enum VpKernelIDNext
197197
{
198198
vpKernelIDNextBase = 0x200,
199199
kernelHdr3DLutCalc = vpKernelIDNextBase,
200-
kernelHdr3DLutCalcL0,
200+
kernelHdr3DLutCalcOcl,
201201
kernelHVSCalc,
202202
vpKernelIDNextMax
203203
};

‎media_softlet/agnostic/Xe_R/Xe2_HPG/vp/kernel/igvp3dlut_xe2.cpp

+302
Large diffs are not rendered by default.

‎media_softlet/agnostic/Xe_R/Xe2_HPG/vp/kernel/igvp3dlut_xe2.h

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* Copyright (c) 2024, Intel Corporation
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a
5+
* copy of this software and associated documentation files (the
6+
* 'Software'), to deal in the Software without restriction, including
7+
* without limitation the rights to use, copy, modify, merge, publish,
8+
* distribute, sublicense, and/or sell copies of the Software, and to
9+
* permit persons to whom the Software is furnished to do so, subject to
10+
* the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included
13+
* in all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
16+
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21+
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*/
23+
24+
////////////////////////////////////////////////////////////////////////////////
25+
// !!! WARNING - AUTO GENERATED FILE. DO NOT EDIT DIRECTLY. !!!
26+
// Generated by KernelBinToSource.exe tool
27+
////////////////////////////////////////////////////////////////////////////////
28+
29+
#ifndef __IGVP3DLUT_XE2_H__
30+
#define __IGVP3DLUT_XE2_H__
31+
32+
#include "media_bin_mgr.h"
33+
DECLARE_SHARED_ARRAY_SIZE_UINT32(IGVP3DLUT_GENERATION_XE2_SIZE);
34+
DECLARE_SHARED_ARRAY_UINT32(IGVP3DLUT_GENERATION_XE2);
35+
36+
#if defined(MEDIA_BIN_SUPPORT)
37+
38+
#define IGVP3DLUT_GENERATION_XE2_NAME "IGVP3DLUT_XE2"
39+
40+
#if defined(MEDIA_BIN_DLL)
41+
static bool registerIGVP3DLUT_XE2 = RegisterMediaBin(IGVP3DLUT_GENERATION_XE2_NAME, IGVP3DLUT_GENERATION_XE2_SIZE, IGVP3DLUT_GENERATION_XE2);
42+
43+
#endif // defined(MEDIA_BIN_DLL)
44+
45+
#endif // defined(MEDIA_BIN_SUPPORT)
46+
47+
#if !defined(MEDIA_BIN_DLL)
48+
#include "igvp3dlut_args.h"
49+
// Following functions are always needed in media driver dll no matter media_bin_supported or not
50+
extern void AddVpNativeKernelEntryToList3dlutXe2(vp::VpPlatformInterface &vpPlatformInterface);
51+
#endif // !defined(MEDIA_BIN_DLL)
52+
53+
#endif // __IGVP3DLUT_XE2_H__

‎media_softlet/agnostic/Xe_R/Xe2_HPG/vp/kernel/media_srcs.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ set(TMP_SOURCES_
3030
${CMAKE_CURRENT_LIST_DIR}/igvpfc_420PL3_output_xe2.cpp
3131
${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_input_xe2.cpp
3232
${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_output_xe2.cpp
33+
${CMAKE_CURRENT_LIST_DIR}/igvp3dlut_xe2.cpp
3334
)
3435

3536

@@ -42,6 +43,7 @@ set(TMP_HEADERS_
4243
${CMAKE_CURRENT_LIST_DIR}/igvpfc_420PL3_output_xe2.h
4344
${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_input_xe2.h
4445
${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_output_xe2.h
46+
${CMAKE_CURRENT_LIST_DIR}/igvp3dlut_xe2.h
4547
)
4648

4749
set(SOFTLET_VP_SOURCES_

‎media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1318,9 +1318,9 @@ MOS_STATUS SwFilterHdr::Configure(VP_PIPELINE_PARAMS &params, bool isInputSurf,
13181318
auto userFeatureControl = m_vpInterface.GetHwInterface()->m_userFeatureControl;
13191319
auto vpPlatformInterface = m_vpInterface.GetHwInterface()->m_vpPlatformInterface;
13201320
VpFeatureReport *vpFeatureReport = dynamic_cast<VpFeatureReport *>(m_vpInterface.GetHwInterface()->m_reporting);
1321+
m_Params.isOclKernelEnabled = userFeatureControl->EnableOcl3DLut();
13211322
#if (_DEBUG || _RELEASE_INTERNAL)
1322-
m_Params.isL0KernelEnabled = (vpPlatformInterface->IsAdvanceNativeKernelSupported() && userFeatureControl->EnableL03DLut());
1323-
vpFeatureReport->GetFeatures().isL03DLut = m_Params.isL0KernelEnabled;
1323+
vpFeatureReport->GetFeatures().isOcl3DLut = m_Params.isOclKernelEnabled;
13241324
#endif
13251325

13261326
VP_PUBLIC_CHK_NULL_RETURN(surfInput);

‎media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ struct FeatureParamHdr : public FeatureParam
884884
uint32_t uiSplitFramePortions = 1; //!< Split Frame flag
885885
bool bForceSplitFrame = false;
886886
bool bNeed3DSampler = false; //!< indicate whether 3D should neede by force considering AVS removal etc.
887-
bool isL0KernelEnabled = false;
887+
bool isOclKernelEnabled = false;
888888

889889
HDR_PARAMS srcHDRParams = {};
890890
HDR_PARAMS targetHDRParams = {};

‎media_softlet/agnostic/common/vp/hal/feature_manager/vp_kernelset.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "vp_render_vebox_hdr_3dlut_kernel.h"
3232
#include "vp_render_vebox_hvs_kernel.h"
3333
#include "vp_render_hdr_kernel.h"
34-
#include "vp_render_vebox_hdr_3dlut_l0_kernel.h"
34+
#include "vp_render_vebox_hdr_3dlut_ocl_kernel.h"
3535

3636
using namespace vp;
3737

@@ -149,9 +149,9 @@ MOS_STATUS VpKernelSet::CreateSingleKernelObject(
149149
}
150150
VP_RENDER_CHK_NULL_RETURN(kernel);
151151
break;
152-
case kernelHdr3DLutCalcL0:
153-
VP_RENDER_NORMALMESSAGE("HDR 3dlut kernel use l0 fillLutTable_3dlut kernel");
154-
kernel = (VpRenderKernelObj *)MOS_New(VpRenderHdr3DLutL0Kernel, m_hwInterface, m_allocator);
152+
case kernelHdr3DLutCalcOcl:
153+
VP_RENDER_NORMALMESSAGE("HDR 3dlut kernel use ocl fillLutTable_3dlut kernel");
154+
kernel = (VpRenderKernelObj *)MOS_New(VpRenderHdr3DLutOclKernel, m_hwInterface, m_allocator);
155155
VP_RENDER_CHK_NULL_RETURN(kernel);
156156
break;
157157
case kernelHVSCalc:

‎media_softlet/agnostic/common/vp/hal/features/vp_hdr_filter.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ MOS_STATUS VpHdrFilter::Prepare()
5454
MOS_STATUS VpHdrFilter::Destroy()
5555
{
5656
VP_FUNC_CALL();
57-
for (auto &handle : m_renderHdr3DLutL0Params)
57+
for (auto &handle : m_renderHdr3DLutOclParams)
5858
{
5959
KRN_ARG &krnArg = handle.second;
6060
MOS_FreeMemAndSetNull(krnArg.pData);
@@ -116,7 +116,7 @@ MOS_STATUS VpHdrFilter::CalculateEngineParams(
116116
m_renderHdr3DLutParams.threadWidth = hdrParams.lutSize;
117117
m_renderHdr3DLutParams.threadHeight = hdrParams.lutSize;
118118

119-
if (hdrParams.isL0KernelEnabled == false)
119+
if (hdrParams.isOclKernelEnabled == false)
120120
{
121121
KRN_ARG krnArg = {};
122122
krnArg.uIndex = 0;
@@ -157,18 +157,18 @@ MOS_STATUS VpHdrFilter::CalculateEngineParams(
157157
uint32_t localDepth = 1;
158158
m_renderHdr3DLutParams.localWidth = localWidth;
159159
m_renderHdr3DLutParams.localHeight = localHeight;
160-
m_renderHdr3DLutParams.kernelId = (VpKernelID)kernelHdr3DLutCalcL0;
160+
m_renderHdr3DLutParams.kernelId = (VpKernelID)kernelHdr3DLutCalcOcl;
161161

162162
//step 1: setting curbe arguments
163163
for (auto const &kernelArg : kernelArgs)
164164
{
165165
uint32_t uIndex = kernelArg.uIndex;
166-
auto argHandle = m_renderHdr3DLutL0Params.find(uIndex);
167-
if (argHandle == m_renderHdr3DLutL0Params.end())
166+
auto argHandle = m_renderHdr3DLutOclParams.find(uIndex);
167+
if (argHandle == m_renderHdr3DLutOclParams.end())
168168
{
169169
KRN_ARG krnArg = {};
170-
argHandle = m_renderHdr3DLutL0Params.insert(std::make_pair(uIndex, krnArg)).first;
171-
VP_PUBLIC_CHK_NOT_FOUND_RETURN(argHandle, &m_renderHdr3DLutL0Params);
170+
argHandle = m_renderHdr3DLutOclParams.insert(std::make_pair(uIndex, krnArg)).first;
171+
VP_PUBLIC_CHK_NOT_FOUND_RETURN(argHandle, &m_renderHdr3DLutOclParams);
172172
}
173173
KRN_ARG &krnArg = argHandle->second;
174174
krnArg.uIndex = uIndex;

‎media_softlet/agnostic/common/vp/hal/features/vp_hdr_filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class VpHdrFilter : public VpFilter
243243
VEBOX_HDR_PARAMS m_veboxHdrParams = {};
244244
RENDER_HDR_3DLUT_CAL_PARAMS m_renderHdr3DLutParams = {};
245245
RENDER_HDR_PARAMS m_renderHdrParams = {};
246-
KERNEL_INDEX_ARG_MAP m_renderHdr3DLutL0Params = {};
246+
KERNEL_INDEX_ARG_MAP m_renderHdr3DLutOclParams = {};
247247
SwFilterPipe *m_executedPipe = nullptr;
248248

249249
SurfaceType m_surfType3DLut = SurfaceType3DLut;

‎media_softlet/agnostic/common/vp/hal/packet/media_srcs.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(TMP_SOURCES_
3232
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_kernel.cpp
3333
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hvs_kernel.cpp
3434
${CMAKE_CURRENT_LIST_DIR}/vp_render_hdr_kernel.cpp
35-
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_l0_kernel.cpp
35+
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_ocl_kernel.cpp
3636
${CMAKE_CURRENT_LIST_DIR}/vp_frametracker.cpp
3737
${CMAKE_CURRENT_LIST_DIR}/vp_render_ocl_fc_kernel.cpp
3838
)
@@ -56,7 +56,7 @@ set(TMP_HEADERS_
5656
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_kernel.h
5757
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hvs_kernel.h
5858
${CMAKE_CURRENT_LIST_DIR}/vp_render_hdr_kernel.h
59-
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_l0_kernel.h
59+
${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_ocl_kernel.h
6060
${CMAKE_CURRENT_LIST_DIR}/vp_frametracker.h
6161
${CMAKE_CURRENT_LIST_DIR}/vp_render_ocl_fc_kernel.h
6262
)

‎media_softlet/agnostic/common/vp/hal/packet/vp_render_vebox_hdr_3dlut_l0_kernel.cpp ‎media_softlet/agnostic/common/vp/hal/packet/vp_render_vebox_hdr_3dlut_ocl_kernel.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
2222
//!
23-
//! \file vp_render_vebox_hdr_3dlut_l0_kernel.cpp
23+
//! \file vp_render_vebox_hdr_3dlut_ocl_kernel.cpp
2424
//! \brief render packet which used in by mediapipline.
2525
//! \details render packet provide the structures and generate the cmd buffer which mediapipline will used.
2626
//!
27-
#include "vp_render_vebox_hdr_3dlut_l0_kernel.h"
27+
#include "vp_render_vebox_hdr_3dlut_ocl_kernel.h"
2828
#include "vp_dumper.h"
2929
#include "vp_kernelset.h"
3030

@@ -203,22 +203,22 @@ static void CalcCCMMatrix()
203203
color_matrix_calculation[2][3] = 0.0f;
204204
}
205205

206-
// Used by L0 kernel
207-
VpRenderHdr3DLutL0Kernel::VpRenderHdr3DLutL0Kernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator) :
208-
VpRenderKernelObj(hwInterface, (VpKernelID)kernelHdr3DLutCalcL0, 0, VP_HDR_KERNEL_NAME_L0_3DLUT, allocator)
206+
// Used by OCL kernel
207+
VpRenderHdr3DLutOclKernel::VpRenderHdr3DLutOclKernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator) :
208+
VpRenderKernelObj(hwInterface, (VpKernelID)kernelHdr3DLutCalcOcl, 0, VP_HDR_KERNEL_NAME_OCL_3DLUT, allocator)
209209
{
210210
VP_FUNC_CALL();
211-
m_kernelBinaryID = VP_ADV_KERNEL_BINARY_ID(kernelHdr3DLutCalcL0);
211+
m_kernelBinaryID = VP_ADV_KERNEL_BINARY_ID(kernelHdr3DLutCalcOcl);
212212
m_isAdvKernel = true;
213213
}
214214

215-
VpRenderHdr3DLutL0Kernel::~VpRenderHdr3DLutL0Kernel()
215+
VpRenderHdr3DLutOclKernel::~VpRenderHdr3DLutOclKernel()
216216
{
217217
MOS_SafeFreeMemory(m_curbe);
218218
m_curbe = nullptr;
219219
}
220220

221-
MOS_STATUS VpRenderHdr3DLutL0Kernel::Init(VpRenderKernel &kernel)
221+
MOS_STATUS VpRenderHdr3DLutOclKernel::Init(VpRenderKernel &kernel)
222222
{
223223
VP_FUNC_CALL();
224224

@@ -248,15 +248,15 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::Init(VpRenderKernel &kernel)
248248
}
249249

250250

251-
MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupSurfaceState()
251+
MOS_STATUS VpRenderHdr3DLutOclKernel::SetupSurfaceState()
252252
{
253253
VP_FUNC_CALL();
254254
VP_RENDER_CHK_STATUS_RETURN(InitCoefSurface(m_maxDisplayLum, m_maxContentLevelLum, m_hdrMode));
255255

256256
return MOS_STATUS_SUCCESS;
257257
}
258258

259-
MOS_STATUS VpRenderHdr3DLutL0Kernel::CpPrepareResources()
259+
MOS_STATUS VpRenderHdr3DLutOclKernel::CpPrepareResources()
260260
{
261261
VP_FUNC_CALL();
262262

@@ -281,7 +281,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::CpPrepareResources()
281281
return MOS_STATUS_SUCCESS;
282282
}
283283

284-
MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupStatelessBuffer()
284+
MOS_STATUS VpRenderHdr3DLutOclKernel::SetupStatelessBuffer()
285285
{
286286
VP_FUNC_CALL();
287287
m_statelessArray.clear();
@@ -290,7 +290,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupStatelessBuffer()
290290
return MOS_STATUS_SUCCESS;
291291
}
292292

293-
MOS_STATUS VpRenderHdr3DLutL0Kernel::GetCurbeState(void *&curbe, uint32_t &curbeLength)
293+
MOS_STATUS VpRenderHdr3DLutOclKernel::GetCurbeState(void *&curbe, uint32_t &curbeLength)
294294
{
295295
VP_FUNC_CALL();
296296
curbeLength = m_curbeSize;
@@ -359,7 +359,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::GetCurbeState(void *&curbe, uint32_t &curbe
359359
}
360360

361361

362-
MOS_STATUS VpRenderHdr3DLutL0Kernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walkerParam, KERNEL_PACKET_RENDER_DATA &renderData)
362+
MOS_STATUS VpRenderHdr3DLutOclKernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walkerParam, KERNEL_PACKET_RENDER_DATA &renderData)
363363
{
364364

365365
VP_FUNC_CALL();
@@ -376,7 +376,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walk
376376
}
377377

378378
// Only for Adv kernels.
379-
MOS_STATUS VpRenderHdr3DLutL0Kernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threadSpace, bool bSyncFlag, bool flushL1)
379+
MOS_STATUS VpRenderHdr3DLutOclKernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threadSpace, bool bSyncFlag, bool flushL1)
380380
{
381381
VP_FUNC_CALL();
382382
MOS_ZeroMemory(&m_walkerParam, sizeof(KERNEL_WALKER_PARAMS));
@@ -426,7 +426,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threa
426426
return MOS_STATUS_SUCCESS;
427427
}
428428

429-
MOS_STATUS VpRenderHdr3DLutL0Kernel::InitCoefSurface(const uint32_t maxDLL, const uint32_t maxCLL, const VPHAL_HDR_MODE hdrMode)
429+
MOS_STATUS VpRenderHdr3DLutOclKernel::InitCoefSurface(const uint32_t maxDLL, const uint32_t maxCLL, const VPHAL_HDR_MODE hdrMode)
430430
{
431431
VP_FUNC_CALL();
432432
float *hdrcoefBuffer = nullptr;
@@ -500,10 +500,10 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::InitCoefSurface(const uint32_t maxDLL, cons
500500
return MOS_STATUS_SUCCESS;
501501
}
502502

503-
MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConfigs)
503+
MOS_STATUS VpRenderHdr3DLutOclKernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConfigs)
504504
{
505505
VP_FUNC_CALL();
506-
auto it = kernelConfigs.find((VpKernelID)kernelHdr3DLutCalcL0);
506+
auto it = kernelConfigs.find((VpKernelID)kernelHdr3DLutCalcOcl);
507507

508508
if (kernelConfigs.end() == it || nullptr == it->second)
509509
{
@@ -536,7 +536,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConf
536536

537537

538538

539-
MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_PACKET_SHARED_CONTEXT *sharedContext)
539+
MOS_STATUS VpRenderHdr3DLutOclKernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_PACKET_SHARED_CONTEXT *sharedContext)
540540
{
541541
VP_FUNC_CALL();
542542

@@ -574,7 +574,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_P
574574
return MOS_STATUS_SUCCESS;
575575
}
576576

577-
void VpRenderHdr3DLutL0Kernel::DumpSurfaces()
577+
void VpRenderHdr3DLutOclKernel::DumpSurfaces()
578578
{
579579
VP_FUNC_CALL();
580580
for (auto &arg : m_kernelArgs)

‎media_softlet/agnostic/common/vp/hal/packet/vp_render_vebox_hdr_3dlut_l0_kernel.h ‎media_softlet/agnostic/common/vp/hal/packet/vp_render_vebox_hdr_3dlut_ocl_kernel.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
22-
#ifndef __VP_RENDER_VEBOX_HDR_3DLUT_L0_KERNEL_H__
23-
#define __VP_RENDER_VEBOX_HDR_3DLUT_L0_KERNEL_H__
22+
#ifndef __VP_RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL_H__
23+
#define __VP_RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL_H__
2424

2525
#include "vp_render_cmd_packet.h"
2626
#include "vp_render_vebox_hdr_3dlut_kernel.h"
27-
#define VP_HDR_KERNEL_NAME_L0_3DLUT "fillLutTable_3dlut"
27+
#define VP_HDR_KERNEL_NAME_OCL_3DLUT "fillLutTable_3dlut"
2828
namespace vp
2929
{
3030
//!
3131
//! \brief Tone Mapping Source Type, Please don't change the Enmu Value.
3232
//! \details These Enmu Values are passed to media kernel for further processing.
3333
//!
3434

35-
class VpRenderHdr3DLutL0Kernel : public VpRenderKernelObj
35+
class VpRenderHdr3DLutOclKernel : public VpRenderKernelObj
3636
{
3737
public:
38-
VpRenderHdr3DLutL0Kernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator);
39-
virtual ~VpRenderHdr3DLutL0Kernel();
38+
VpRenderHdr3DLutOclKernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator);
39+
virtual ~VpRenderHdr3DLutOclKernel();
4040

4141
virtual MOS_STATUS Init(VpRenderKernel& kernel);
4242
virtual MOS_STATUS GetCurbeState(void *&curbe, uint32_t &curbeLength) override;
@@ -83,9 +83,9 @@ class VpRenderHdr3DLutL0Kernel : public VpRenderKernelObj
8383
KRN_EXECUTE_ENV m_kernelEnv = {};
8484
KERNEL_ARG_INDEX_SURFACE_MAP m_argIndexSurfMap = {};
8585

86-
MEDIA_CLASS_DEFINE_END(vp__VpRenderHdr3DLutL0Kernel)
86+
MEDIA_CLASS_DEFINE_END(vp__VpRenderHdr3DLutOclKernel)
8787
};
8888

8989
} // namespace vp
9090

91-
#endif //__RENDER_VEBOX_HDR_3DLUT_L0_KERNEL__
91+
#endif //__RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL__

‎media_softlet/agnostic/common/vp/hal/pipeline/vp_feature_report.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class VpFeatureReport
7272
uint8_t rtCacheSetting = 0; //!< Render Target cache usage
7373
#if (_DEBUG || _RELEASE_INTERNAL)
7474
uint8_t rtOldCacheSetting = 0; //!< Render Target old cache usage
75-
bool isL03DLut = false;
75+
bool isOcl3DLut = false;
7676
bool isOclFC = false;
7777
uint32_t diffLogOclFC = 0;
7878
uint32_t featureLogOclFC = 0;

‎media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ MOS_STATUS VpPipeline::UserFeatureReport()
218218
{
219219
m_reporting->GetFeatures().rtOldCacheSetting = (uint8_t)(m_vpMhwInterface.m_renderHal->oldCacheSettingForTargetSurface);
220220
}
221-
if (m_reporting->GetFeatures().isL03DLut)
221+
if (m_reporting->GetFeatures().isOcl3DLut)
222222
{
223-
VP_PUBLIC_NORMALMESSAGE("VP L0 3DLut Enabled");
223+
VP_PUBLIC_NORMALMESSAGE("VP OCL 3DLut Enabled");
224224
ReportUserSettingForDebug(
225225
m_userSettingPtr,
226-
__MEDIA_USER_FEATURE_VALUE_VP_L0_3DLUT_ENABLED,
226+
__MEDIA_USER_FEATURE_VALUE_VP_OCL_3DLUT_ENABLED,
227227
1,
228228
MediaUserSetting::Group::Sequence);
229229
}

0 commit comments

Comments
 (0)