[VP] Rename L0 to OCL for 3DLut

(1) rename related files (2) enable feature to all build instead of release internal only

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

@@ -197,7 +197,7 @@ enum VpKernelIDNext
 {
     vpKernelIDNextBase = 0x200,
     kernelHdr3DLutCalc = vpKernelIDNextBase,
-    kernelHdr3DLutCalcL0,
+    kernelHdr3DLutCalcOcl,
     kernelHVSCalc,
     vpKernelIDNextMax
 };

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024, Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+// !!! WARNING - AUTO GENERATED FILE. DO NOT EDIT DIRECTLY. !!!
+// Generated by KernelBinToSource.exe tool
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef __IGVP3DLUT_XE2_H__
+#define __IGVP3DLUT_XE2_H__
+
+#include "media_bin_mgr.h"
+DECLARE_SHARED_ARRAY_SIZE_UINT32(IGVP3DLUT_GENERATION_XE2_SIZE);
+DECLARE_SHARED_ARRAY_UINT32(IGVP3DLUT_GENERATION_XE2);
+
+#if defined(MEDIA_BIN_SUPPORT)
+
+#define IGVP3DLUT_GENERATION_XE2_NAME "IGVP3DLUT_XE2"
+
+#if defined(MEDIA_BIN_DLL)
+static bool registerIGVP3DLUT_XE2 = RegisterMediaBin(IGVP3DLUT_GENERATION_XE2_NAME, IGVP3DLUT_GENERATION_XE2_SIZE, IGVP3DLUT_GENERATION_XE2);
+
+#endif  // defined(MEDIA_BIN_DLL)
+
+#endif  // defined(MEDIA_BIN_SUPPORT)
+
+#if !defined(MEDIA_BIN_DLL)
+#include "igvp3dlut_args.h"
+// Following functions are always needed in media driver dll no matter media_bin_supported or not
+extern void AddVpNativeKernelEntryToList3dlutXe2(vp::VpPlatformInterface &vpPlatformInterface);
+#endif  // !defined(MEDIA_BIN_DLL)
+
+#endif // __IGVP3DLUT_XE2_H__

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

@@ -30,6 +30,7 @@ set(TMP_SOURCES_
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_420PL3_output_xe2.cpp
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_input_xe2.cpp
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_output_xe2.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/igvp3dlut_xe2.cpp
 )
 
 
@@ -42,6 +43,7 @@ set(TMP_HEADERS_
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_420PL3_output_xe2.h
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_input_xe2.h
     ${CMAKE_CURRENT_LIST_DIR}/igvpfc_444PL3_output_xe2.h
+    ${CMAKE_CURRENT_LIST_DIR}/igvp3dlut_xe2.h
 )
 
 set(SOFTLET_VP_SOURCES_

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

@@ -1318,9 +1318,9 @@ MOS_STATUS SwFilterHdr::Configure(VP_PIPELINE_PARAMS &params, bool isInputSurf,
     auto userFeatureControl = m_vpInterface.GetHwInterface()->m_userFeatureControl;
     auto vpPlatformInterface = m_vpInterface.GetHwInterface()->m_vpPlatformInterface;
     VpFeatureReport *vpFeatureReport  = dynamic_cast<VpFeatureReport *>(m_vpInterface.GetHwInterface()->m_reporting);
+    m_Params.isOclKernelEnabled          = userFeatureControl->EnableOcl3DLut();
 #if (_DEBUG || _RELEASE_INTERNAL)
-    m_Params.isL0KernelEnabled               = (vpPlatformInterface->IsAdvanceNativeKernelSupported() && userFeatureControl->EnableL03DLut());
-    vpFeatureReport->GetFeatures().isL03DLut = m_Params.isL0KernelEnabled;
+    vpFeatureReport->GetFeatures().isOcl3DLut = m_Params.isOclKernelEnabled;
 #endif
 
     VP_PUBLIC_CHK_NULL_RETURN(surfInput);

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

@@ -884,7 +884,7 @@ struct FeatureParamHdr : public FeatureParam
     uint32_t                uiSplitFramePortions                 = 1;                     //!< Split Frame flag
     bool                    bForceSplitFrame                     = false;
     bool                    bNeed3DSampler                       = false;                 //!< indicate whether 3D should neede by force considering AVS removal etc.
-    bool                    isL0KernelEnabled                    = false;
+    bool                    isOclKernelEnabled                    = false;
 
     HDR_PARAMS srcHDRParams    = {};
     HDR_PARAMS targetHDRParams = {};

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

@@ -31,7 +31,7 @@
 #include "vp_render_vebox_hdr_3dlut_kernel.h"
 #include "vp_render_vebox_hvs_kernel.h"
 #include "vp_render_hdr_kernel.h"
-#include "vp_render_vebox_hdr_3dlut_l0_kernel.h"
+#include "vp_render_vebox_hdr_3dlut_ocl_kernel.h"
 
 using namespace vp;
 
@@ -149,9 +149,9 @@ MOS_STATUS VpKernelSet::CreateSingleKernelObject(
         }
         VP_RENDER_CHK_NULL_RETURN(kernel);
         break;
-    case kernelHdr3DLutCalcL0:
-        VP_RENDER_NORMALMESSAGE("HDR 3dlut kernel use l0 fillLutTable_3dlut kernel");
-        kernel = (VpRenderKernelObj *)MOS_New(VpRenderHdr3DLutL0Kernel, m_hwInterface, m_allocator);
+    case kernelHdr3DLutCalcOcl:
+        VP_RENDER_NORMALMESSAGE("HDR 3dlut kernel use ocl fillLutTable_3dlut kernel");
+        kernel = (VpRenderKernelObj *)MOS_New(VpRenderHdr3DLutOclKernel, m_hwInterface, m_allocator);
         VP_RENDER_CHK_NULL_RETURN(kernel);
         break;
     case kernelHVSCalc:

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

@@ -54,7 +54,7 @@ MOS_STATUS VpHdrFilter::Prepare()
 MOS_STATUS VpHdrFilter::Destroy()
 {
     VP_FUNC_CALL();
-    for (auto &handle : m_renderHdr3DLutL0Params)
+    for (auto &handle : m_renderHdr3DLutOclParams)
     {
         KRN_ARG &krnArg = handle.second;
         MOS_FreeMemAndSetNull(krnArg.pData);
@@ -116,7 +116,7 @@ MOS_STATUS VpHdrFilter::CalculateEngineParams(
         m_renderHdr3DLutParams.threadWidth  = hdrParams.lutSize;
         m_renderHdr3DLutParams.threadHeight = hdrParams.lutSize;
 
-        if (hdrParams.isL0KernelEnabled == false)
+        if (hdrParams.isOclKernelEnabled == false)
         {
             KRN_ARG krnArg  = {};
             krnArg.uIndex   = 0;
@@ -157,18 +157,18 @@ MOS_STATUS VpHdrFilter::CalculateEngineParams(
             uint32_t    localDepth             = 1;
             m_renderHdr3DLutParams.localWidth  = localWidth;
             m_renderHdr3DLutParams.localHeight = localHeight;
-            m_renderHdr3DLutParams.kernelId    = (VpKernelID)kernelHdr3DLutCalcL0;
+            m_renderHdr3DLutParams.kernelId    = (VpKernelID)kernelHdr3DLutCalcOcl;
 
             //step 1: setting curbe arguments
             for (auto const &kernelArg : kernelArgs)
             {
                 uint32_t uIndex    = kernelArg.uIndex;
-                auto     argHandle = m_renderHdr3DLutL0Params.find(uIndex);
-                if (argHandle == m_renderHdr3DLutL0Params.end())
+                auto     argHandle = m_renderHdr3DLutOclParams.find(uIndex);
+                if (argHandle == m_renderHdr3DLutOclParams.end())
                 {
                     KRN_ARG krnArg = {};
-                    argHandle      = m_renderHdr3DLutL0Params.insert(std::make_pair(uIndex, krnArg)).first;
-                    VP_PUBLIC_CHK_NOT_FOUND_RETURN(argHandle, &m_renderHdr3DLutL0Params);
+                    argHandle      = m_renderHdr3DLutOclParams.insert(std::make_pair(uIndex, krnArg)).first;
+                    VP_PUBLIC_CHK_NOT_FOUND_RETURN(argHandle, &m_renderHdr3DLutOclParams);
                 }
                 KRN_ARG &krnArg = argHandle->second;
                 krnArg.uIndex   = uIndex;

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

@@ -243,7 +243,7 @@ class VpHdrFilter : public VpFilter
     VEBOX_HDR_PARAMS m_veboxHdrParams = {};
     RENDER_HDR_3DLUT_CAL_PARAMS m_renderHdr3DLutParams = {};
     RENDER_HDR_PARAMS           m_renderHdrParams      = {};
-    KERNEL_INDEX_ARG_MAP        m_renderHdr3DLutL0Params = {};
+    KERNEL_INDEX_ARG_MAP        m_renderHdr3DLutOclParams = {};
     SwFilterPipe                *m_executedPipe        = nullptr;
 
     SurfaceType m_surfType3DLut         = SurfaceType3DLut;

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

@@ -32,7 +32,7 @@ set(TMP_SOURCES_
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_kernel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hvs_kernel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_hdr_kernel.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_l0_kernel.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_ocl_kernel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/vp_frametracker.cpp
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_ocl_fc_kernel.cpp
 )
@@ -56,7 +56,7 @@ set(TMP_HEADERS_
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_kernel.h
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hvs_kernel.h
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_hdr_kernel.h
-    ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_l0_kernel.h
+    ${CMAKE_CURRENT_LIST_DIR}/vp_render_vebox_hdr_3dlut_ocl_kernel.h
     ${CMAKE_CURRENT_LIST_DIR}/vp_frametracker.h
     ${CMAKE_CURRENT_LIST_DIR}/vp_render_ocl_fc_kernel.h
 )

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

@@ -20,11 +20,11 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
 //!
-//! \file     vp_render_vebox_hdr_3dlut_l0_kernel.cpp
+//! \file     vp_render_vebox_hdr_3dlut_ocl_kernel.cpp
 //! \brief    render packet which used in by mediapipline.
 //! \details  render packet provide the structures and generate the cmd buffer which mediapipline will used.
 //!
-#include "vp_render_vebox_hdr_3dlut_l0_kernel.h"
+#include "vp_render_vebox_hdr_3dlut_ocl_kernel.h"
 #include "vp_dumper.h"
 #include "vp_kernelset.h"
 
@@ -203,22 +203,22 @@ static void CalcCCMMatrix()
     color_matrix_calculation[2][3] = 0.0f;
 }
 
-// Used by L0 kernel
-VpRenderHdr3DLutL0Kernel::VpRenderHdr3DLutL0Kernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator) :
-    VpRenderKernelObj(hwInterface, (VpKernelID)kernelHdr3DLutCalcL0, 0, VP_HDR_KERNEL_NAME_L0_3DLUT, allocator)
+// Used by OCL kernel
+VpRenderHdr3DLutOclKernel::VpRenderHdr3DLutOclKernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator) :
+    VpRenderKernelObj(hwInterface, (VpKernelID)kernelHdr3DLutCalcOcl, 0, VP_HDR_KERNEL_NAME_OCL_3DLUT, allocator)
 {
     VP_FUNC_CALL();
-    m_kernelBinaryID = VP_ADV_KERNEL_BINARY_ID(kernelHdr3DLutCalcL0);
+    m_kernelBinaryID = VP_ADV_KERNEL_BINARY_ID(kernelHdr3DLutCalcOcl);
     m_isAdvKernel    = true;
 }
 
-VpRenderHdr3DLutL0Kernel::~VpRenderHdr3DLutL0Kernel()
+VpRenderHdr3DLutOclKernel::~VpRenderHdr3DLutOclKernel()
 {
     MOS_SafeFreeMemory(m_curbe);
     m_curbe = nullptr;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::Init(VpRenderKernel &kernel)
+MOS_STATUS VpRenderHdr3DLutOclKernel::Init(VpRenderKernel &kernel)
 {
     VP_FUNC_CALL();
 
@@ -248,15 +248,15 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::Init(VpRenderKernel &kernel)
 }
 
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupSurfaceState()
+MOS_STATUS VpRenderHdr3DLutOclKernel::SetupSurfaceState()
 {
     VP_FUNC_CALL();
     VP_RENDER_CHK_STATUS_RETURN(InitCoefSurface(m_maxDisplayLum, m_maxContentLevelLum, m_hdrMode));
 
     return MOS_STATUS_SUCCESS;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::CpPrepareResources()
+MOS_STATUS VpRenderHdr3DLutOclKernel::CpPrepareResources()
 {
     VP_FUNC_CALL();
 
@@ -281,7 +281,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::CpPrepareResources()
     return MOS_STATUS_SUCCESS;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupStatelessBuffer()
+MOS_STATUS VpRenderHdr3DLutOclKernel::SetupStatelessBuffer()
 {
     VP_FUNC_CALL();
     m_statelessArray.clear();
@@ -290,7 +290,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetupStatelessBuffer()
     return MOS_STATUS_SUCCESS;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::GetCurbeState(void *&curbe, uint32_t &curbeLength)
+MOS_STATUS VpRenderHdr3DLutOclKernel::GetCurbeState(void *&curbe, uint32_t &curbeLength)
 {
     VP_FUNC_CALL();
     curbeLength = m_curbeSize;
@@ -359,7 +359,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::GetCurbeState(void *&curbe, uint32_t &curbe
 }
 
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walkerParam, KERNEL_PACKET_RENDER_DATA &renderData)
+MOS_STATUS VpRenderHdr3DLutOclKernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walkerParam, KERNEL_PACKET_RENDER_DATA &renderData)
 {
 
     VP_FUNC_CALL();
@@ -376,7 +376,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::GetWalkerSetting(KERNEL_WALKER_PARAMS &walk
 }
 
 // Only for Adv kernels.
-MOS_STATUS VpRenderHdr3DLutL0Kernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threadSpace, bool bSyncFlag, bool flushL1)
+MOS_STATUS VpRenderHdr3DLutOclKernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threadSpace, bool bSyncFlag, bool flushL1)
 {
     VP_FUNC_CALL();
     MOS_ZeroMemory(&m_walkerParam, sizeof(KERNEL_WALKER_PARAMS));
@@ -426,7 +426,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetWalkerSetting(KERNEL_THREAD_SPACE &threa
     return MOS_STATUS_SUCCESS;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::InitCoefSurface(const uint32_t maxDLL, const uint32_t maxCLL, const VPHAL_HDR_MODE hdrMode)
+MOS_STATUS VpRenderHdr3DLutOclKernel::InitCoefSurface(const uint32_t maxDLL, const uint32_t maxCLL, const VPHAL_HDR_MODE hdrMode)
 {
     VP_FUNC_CALL();
     float  *hdrcoefBuffer = nullptr;
@@ -500,10 +500,10 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::InitCoefSurface(const uint32_t maxDLL, cons
     return MOS_STATUS_SUCCESS;
 }
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConfigs)
+MOS_STATUS VpRenderHdr3DLutOclKernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConfigs)
 {
     VP_FUNC_CALL();
-    auto it = kernelConfigs.find((VpKernelID)kernelHdr3DLutCalcL0);
+    auto it = kernelConfigs.find((VpKernelID)kernelHdr3DLutCalcOcl);
 
     if (kernelConfigs.end() == it || nullptr == it->second)
     {
@@ -536,7 +536,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelConfigs(KERNEL_CONFIGS &kernelConf
 
 
 
-MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_PACKET_SHARED_CONTEXT *sharedContext)
+MOS_STATUS VpRenderHdr3DLutOclKernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_PACKET_SHARED_CONTEXT *sharedContext)
 {
     VP_FUNC_CALL();
 
@@ -574,7 +574,7 @@ MOS_STATUS VpRenderHdr3DLutL0Kernel::SetKernelArgs(KERNEL_ARGS &kernelArgs, VP_P
     return MOS_STATUS_SUCCESS;
 }
 
-void VpRenderHdr3DLutL0Kernel::DumpSurfaces()
+void VpRenderHdr3DLutOclKernel::DumpSurfaces()
 {
     VP_FUNC_CALL();
     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

@@ -19,24 +19,24 @@
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 * OTHER DEALINGS IN THE SOFTWARE.
 */
-#ifndef __VP_RENDER_VEBOX_HDR_3DLUT_L0_KERNEL_H__
-#define __VP_RENDER_VEBOX_HDR_3DLUT_L0_KERNEL_H__
+#ifndef __VP_RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL_H__
+#define __VP_RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL_H__
 
 #include "vp_render_cmd_packet.h"
 #include "vp_render_vebox_hdr_3dlut_kernel.h"
-#define VP_HDR_KERNEL_NAME_L0_3DLUT "fillLutTable_3dlut"
+#define VP_HDR_KERNEL_NAME_OCL_3DLUT "fillLutTable_3dlut"
 namespace vp
 {
 //!
 //! \brief    Tone Mapping Source Type, Please don't change the Enmu Value.
 //! \details  These Enmu Values are passed to media kernel for further processing.
 //!
 
-class VpRenderHdr3DLutL0Kernel : public VpRenderKernelObj
+class VpRenderHdr3DLutOclKernel : public VpRenderKernelObj
 {
 public:
-    VpRenderHdr3DLutL0Kernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator);
-    virtual ~VpRenderHdr3DLutL0Kernel();
+    VpRenderHdr3DLutOclKernel(PVP_MHWINTERFACE hwInterface, PVpAllocator allocator);
+    virtual ~VpRenderHdr3DLutOclKernel();
 
     virtual MOS_STATUS Init(VpRenderKernel& kernel);
     virtual MOS_STATUS GetCurbeState(void *&curbe, uint32_t &curbeLength) override;
@@ -83,9 +83,9 @@ class VpRenderHdr3DLutL0Kernel : public VpRenderKernelObj
     KRN_EXECUTE_ENV              m_kernelEnv                     = {};
     KERNEL_ARG_INDEX_SURFACE_MAP m_argIndexSurfMap  = {};
 
-    MEDIA_CLASS_DEFINE_END(vp__VpRenderHdr3DLutL0Kernel)
+    MEDIA_CLASS_DEFINE_END(vp__VpRenderHdr3DLutOclKernel)
 };
 
 }  // namespace vp
 
-#endif //__RENDER_VEBOX_HDR_3DLUT_L0_KERNEL__
+#endif //__RENDER_VEBOX_HDR_3DLUT_OCL_KERNEL__

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

@@ -72,7 +72,7 @@ class VpFeatureReport
         uint8_t                       rtCacheSetting      = 0;                            //!< Render Target cache usage
 #if (_DEBUG || _RELEASE_INTERNAL)
         uint8_t                       rtOldCacheSetting   = 0;                            //!< Render Target old cache usage
-        bool                          isL03DLut           = false;
+        bool                          isOcl3DLut          = false;
         bool                          isOclFC             = false;
         uint32_t                      diffLogOclFC        = 0;
         uint32_t                      featureLogOclFC     = 0;

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

@@ -218,12 +218,12 @@ MOS_STATUS VpPipeline::UserFeatureReport()
             {
                 m_reporting->GetFeatures().rtOldCacheSetting = (uint8_t)(m_vpMhwInterface.m_renderHal->oldCacheSettingForTargetSurface);
             }
-            if (m_reporting->GetFeatures().isL03DLut)
+            if (m_reporting->GetFeatures().isOcl3DLut)
             {
-                VP_PUBLIC_NORMALMESSAGE("VP L0 3DLut Enabled");
+                VP_PUBLIC_NORMALMESSAGE("VP OCL 3DLut Enabled");
                 ReportUserSettingForDebug(
                     m_userSettingPtr,
-                    __MEDIA_USER_FEATURE_VALUE_VP_L0_3DLUT_ENABLED,
+                    __MEDIA_USER_FEATURE_VALUE_VP_OCL_3DLUT_ENABLED,
                     1,
                     MediaUserSetting::Group::Sequence);
             }