From 489d9ed80142f8ec720fc8087da5e22a19becb17 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 27 Jul 2016 12:10:55 -0400 Subject: [PATCH] P4 to Git Change 1295979 by gandryey@gera-w8 on 2016/07/27 11:00:55 SWDEV-86035 - Integrate PAL from //depot/stg/pal_prm/... up to version 179 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/Makefile#9 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#3 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/pal.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palCmdAllocator.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palCmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palColorTargetView.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palCompoundState.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palDeveloperHooks.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palDevice.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palFormatInfo.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palGpuMemory.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palGpuMemoryBindable.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palImage.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palLib.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palPipeline.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palPrivateScreen.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palQueryPool.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palQueue.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palQueueSemaphore.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palScreen.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palShader.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palSwapChain.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/gpuUtil/palTextWriter.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/gpuUtil/palTextWriterImpl.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashBase.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashBaseImpl.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashMap.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashMapImpl.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashSet.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palHashSetImpl.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palIntervalTree.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palIntervalTreeImpl.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/res/ver.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/addrMgr/addrMgr.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/addrMgr/addrMgr1/addrMgr1.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/addrMgr/addrMgr2/addrMgr2.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/cmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/cmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/device.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/device.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/formatInfo.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/g_formatInfo.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/g_mergedFormatInfo.h#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/gpuEvent.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/gpuEvent.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/gpuMemory.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/gpuMemory.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/borderColorPalette.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/borderColorPalette.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/g_gfx6DataFormats.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/g_gfx6MergedDataFormats.h#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Barrier.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6BlendOptimizer.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Chip.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6CmdUtil.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6CmdUtil.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ColorBlendState.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ColorBlendState.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ColorTargetView.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6CompoundState.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6CompoundState.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ComputeCmdBuffer.cpp#8 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ComputePipeline.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ComputePipeline.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6DepthStencilView.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Device.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Device.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6FormatInfo.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6FormatInfo.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipeline.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipeline.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineGs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineGs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineGsTess.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineGsTess.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineTess.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineTess.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineVsPs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6GraphicsPipelineVsPs.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6HwPs.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6HwPs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Image.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6Image.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6IndirectCmdGenerator.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6MaskRam.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PalSettings.cfg#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PerfCtrInfo.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkEsGs.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkEsGs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkLsHs.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkLsHs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkVsPs.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6PipelineChunkVsPs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6QueueContexts.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6QueueContexts.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ScMgr.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6SettingsLoader.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ShaderMemImage.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6ShaderMemImage.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6UniversalCmdBuffer.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx6/gfx6UniversalCmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/doc/PostMortem.docx#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/g_gfx9DataFormats.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/g_gfx9MergedDataFormats.h#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Barrier.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Chip.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9CmdUtil.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ColorTargetView.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9CompoundState.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9CompoundState.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ComputeCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ComputePipeline.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ComputePipeline.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9DepthStencilView.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Device.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Device.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9FormatInfo.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9FormatInfo.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipeline.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipeline.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineGs.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineGs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineGsTess.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineGsTess.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelinePrim.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelinePrim.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineSurfPrim.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineSurfPrim.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineTess.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineTess.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineVsPs.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9GraphicsPipelineVsPs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9HwGs.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9HwPs.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9HwPs.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9HwShader.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9HwShader.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Image.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Image.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9MaskRam.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PerfExperiment.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PerfExperiment.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkGs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkGs.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkHs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkHs.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkPs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkPs.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkVs.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PipelineChunkVs.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9QueueContexts.cpp#8 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9QueueContexts.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ScMgr.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ShaderMemImage.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ShaderMemImage.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9ShaderRingSet.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxCmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxCmdStream.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxDevice.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxDevice.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfxImage.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/graphicsPipeline.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/graphicsPipeline.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/indirectCmdGenerator.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/pipeline.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/pipeline.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/queryPool.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/queryPool.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/g_rpmComputePipelineInfo.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/gfx6/gfx6RsrcProcMgr.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/gfx6/gfx6RsrcProcMgr.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/gfx9/gfx9RsrcProcMgr.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/gfx9/gfx9RsrcProcMgr.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rpmGfxPipelineInfo.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rpmUtil.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rpmUtil.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rsrcProcMgr.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rsrcProcMgr.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImage2d.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImage2dShaderMipLevel.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImage2dms2x.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImage2dms4x.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImage2dms8x.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/copyImageGammaCorrect2d.cs#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/shaders/msaaFmaskCopyImage.cs#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/shader.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/shader.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/shaderCache.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/shaderCache.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/universalCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/heapPerf/asicLexa.txt#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/ossip/oss4/oss4DmaCmdBuffer.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/ossip/ossDmaCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/chip/drv_uvd_if.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5CmdBuffer.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5CmdBuffer.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5DecodePipeline.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5DecodePipeline.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5Device.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvd5/uvd5VideoDecodeStatsQueryPool.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdCmdBuffer.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdCmdBuffer.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdCmdStream.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdDecodePipeline.cpp#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdDecodePipeline.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdDevice.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdQueryPool.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/uvdip/uvdQueryPool.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vce3/vce3CmdBuffer.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vce3/vce3CmdBuffer.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vce3/vce3Device.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vce3/vce3EncodePipeline.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vce3/vce3EncodePipeline.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vceEncodePipeline.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vceEncodePipeline.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vceQueryPool.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/vceip/vceQueryPool.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/image.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/image.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/r800/ciaddrlib.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/r800/ciaddrlib.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/r800/egbaddrlib.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/internalMemMgr.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerCmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerDevice.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerDevice.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerImage.cpp#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerImage.h#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/dbgOverlay/dbgOverlayCmdBuffer.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/dbgOverlay/dbgOverlayCmdBuffer.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/dbgOverlay/dbgOverlayDevice.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/dbgOverlay/dbgOverlayImage.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/decorators.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/decorators.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerCmdBuffer.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerCmdBuffer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerPlatform.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerQueue.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerQueue.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerQueueFileLogger.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxDevice.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxDevice.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxGpuMemory.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxGpuMemory.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxImage.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxQueue.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/lnx/lnxQueue.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm1/wddm1Device.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm1/wddm1Device.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm1/wddm1Queue.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm1/wddm1Queue.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm2/wddm2Device.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm2/wddm2Device.h#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm2/wddm2GpuMemory.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/wddm2/wddm2Queue.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winDevice.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winDevice.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winGpuMemory.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winGpuMemory.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winImage.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winPlatform.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winPlatform.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winPresentTechniqueBlit.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winPresentTechniqueGdi.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winPrivateScreen.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winQueueSemaphore.cpp#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winScreen.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winScreen.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winSwapChain.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/os/win/winSwapChain.h#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/perfExperiment.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/perfExperiment.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/privateScreen.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/privateScreen.h#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/queue.cpp#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/queue.h#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/queueSemaphore.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/settingsLoader.cpp#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/settingsLoader.h#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/vamMgr.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/make/Makefile.pal#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/util/h264.cpp#2 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/dataFormatTemplates.py#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/dataFormatsHelper.py#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/generateMergedFormats/dataFormatTemplates.py#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/generateMergedFormats/dataFormatsHelper.py#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/generateMergedFormats/genDataFormats.py#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/generate/generateMergedFormats/generateFormatHeaders.bat#1 branch ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/tools/teamcity/tc_client.xml#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#16 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#8 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#9 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.hpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.hpp#8 edit [ROCm/clr commit: 9dd15fc110ffd1080db86c1579af7394adf08f3b] --- .../clr/rocclr/runtime/device/pal/paldefs.hpp | 438 +++++++++--------- .../rocclr/runtime/device/pal/paldevice.cpp | 3 +- .../rocclr/runtime/device/pal/paldevice.hpp | 2 +- .../rocclr/runtime/device/pal/palresource.cpp | 79 ++-- .../rocclr/runtime/device/pal/palresource.hpp | 2 +- .../rocclr/runtime/device/pal/palvirtual.cpp | 19 +- .../rocclr/runtime/device/pal/palvirtual.hpp | 4 +- 7 files changed, 276 insertions(+), 271 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index 6547886042..79fec3b054 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp @@ -184,170 +184,170 @@ enum OclVersion { }; struct MemoryFormat { - cl_image_format clFormat_; //!< CL image format - Pal::Format palFormat_; //!< PAL image format - Pal::ChannelMapping palChannel_;//!< PAL channel mapping + cl_image_format clFormat_; //!< CL image format + Pal::ChNumFormat palFormat_; //!< PAL image format + Pal::ChannelMapping palChannel_; //!< PAL channel mapping }; static const MemoryFormat MemoryFormatMap[] = { // R { { CL_R, CL_UNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X8_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_UNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_SNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X8_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_SNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X16_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_SIGNED_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X8_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_SIGNED_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X16_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_SIGNED_INT32 }, - { Pal::ChFmt::R32, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X32_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_UNSIGNED_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X16_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_UNSIGNED_INT32 }, - { Pal::ChFmt::R32, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X32_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_HALF_FLOAT }, - { Pal::ChFmt::R16, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X16_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_R, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero, + Pal::ChNumFormat::X32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, // A { { CL_A, CL_UNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Unorm }, + Pal::ChNumFormat::X8_Unorm, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_UNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Unorm }, + Pal::ChNumFormat::X16_Unorm, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_SNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Snorm }, + Pal::ChNumFormat::X8_Snorm, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_SNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Snorm }, + Pal::ChNumFormat::X16_Snorm, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_SIGNED_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Sint }, + Pal::ChNumFormat::X8_Sint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_SIGNED_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Sint }, + Pal::ChNumFormat::X16_Sint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_SIGNED_INT32}, - { Pal::ChFmt::R32, Pal::NumFmt::Sint }, + Pal::ChNumFormat::X32_Sint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Uint }, + Pal::ChNumFormat::X8_Uint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_UNSIGNED_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Uint }, + Pal::ChNumFormat::X16_Uint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_UNSIGNED_INT32}, - { Pal::ChFmt::R32 , Pal::NumFmt::Uint }, + Pal::ChNumFormat::X32_Uint, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_HALF_FLOAT }, - { Pal::ChFmt::R16, Pal::NumFmt::Float }, + Pal::ChNumFormat::X16_Float, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, { { CL_A, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, + Pal::ChNumFormat::X32_Float, { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero, - Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } }, + Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } }, // RG { { CL_RG, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X8Y8_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_UNORM_INT16 }, - { Pal::ChFmt::R16G16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X16Y16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_SNORM_INT8 }, - { Pal::ChFmt::R8G8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X8Y8_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_SNORM_INT16 }, - { Pal::ChFmt::R16G16, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X16Y16_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_SIGNED_INT8 }, - { Pal::ChFmt::R8G8, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X8Y8_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_SIGNED_INT16 }, - { Pal::ChFmt::R16G16, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X16Y16_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_SIGNED_INT32}, - { Pal::ChFmt::R32G32, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X32Y32_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::R8G8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X8Y8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_UNSIGNED_INT16 }, - { Pal::ChFmt::R16G16, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X16Y16_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_UNSIGNED_INT32}, - { Pal::ChFmt::R32G32, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X32Y32_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_HALF_FLOAT }, - { Pal::ChFmt::R16G16, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X16Y16_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, { { CL_RG, CL_FLOAT }, - { Pal::ChFmt::R32G32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, + Pal::ChNumFormat::X32Y32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } }, /* // RA @@ -381,222 +381,222 @@ MemoryFormatMap[] = { */ // RGB { { CL_RGB, CL_UNORM_INT_101010 }, - { Pal::ChFmt::R10G10B10A2, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X10Y10Z10W2_Unorm, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_RGB, CL_UNSIGNED_INT8 }, // This is used only by blit kernel - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } }, // RGBA { { CL_RGBA, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_UNORM_INT16 }, - { Pal::ChFmt::R16G16B16A16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X16Y16Z16W16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_SNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_SNORM_INT16 }, - { Pal::ChFmt::R16G16B16A16, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X16Y16Z16W16_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_SIGNED_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_SIGNED_INT16 }, - { Pal::ChFmt::R16G16B16A16, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X16Y16Z16W16_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_SIGNED_INT32 }, - { Pal::ChFmt::R32G32B32A32, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X32Y32Z32W32_Sint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_UNSIGNED_INT16 }, - { Pal::ChFmt::R16G16B16A16, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X16Y16Z16W16_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_UNSIGNED_INT32}, - { Pal::ChFmt::R32G32B32A32, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X32Y32Z32W32_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_HALF_FLOAT }, - { Pal::ChFmt::R16G16B16A16, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X16Y16Z16W16_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_RGBA, CL_FLOAT }, - { Pal::ChFmt::R32G32B32A32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X32Y32Z32W32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, // ARGB { { CL_ARGB, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B, - Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8Y8Z8W8_Unorm, + { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z, + Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } }, { { CL_ARGB, CL_SNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B, - Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8Y8Z8W8_Snorm, + { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z, + Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } }, { { CL_ARGB, CL_SIGNED_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B, - Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8Y8Z8W8_Sint, + { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z, + Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } }, { { CL_ARGB, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B, - Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z, + Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } }, // BGRA { { CL_BGRA, CL_UNORM_INT8 }, - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Unorm, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, { { CL_BGRA, CL_SNORM_INT8 }, - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Snorm, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, { { CL_BGRA, CL_SIGNED_INT8 }, - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Sint }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Sint, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, { { CL_BGRA, CL_UNSIGNED_INT8 }, - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, // LUMINANCE { { CL_LUMINANCE, CL_SNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_LUMINANCE, CL_SNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X16_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_LUMINANCE, CL_UNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_LUMINANCE, CL_UNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_LUMINANCE, CL_HALF_FLOAT }, - { Pal::ChFmt::R16, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X16_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, { { CL_LUMINANCE, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } }, // INTENSITY { { CL_INTENSITY, CL_SNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_INTENSITY, CL_SNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Snorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X16_Snorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_INTENSITY, CL_UNORM_INT8 }, - { Pal::ChFmt::R8, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X8_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_INTENSITY, CL_UNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_INTENSITY, CL_HALF_FLOAT }, - { Pal::ChFmt::R16, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X16_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_INTENSITY, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, // sRBGA { { CL_sRGBA, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Srgb }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Srgb, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, { { CL_sRGBA, CL_UNSIGNED_INT8 }, // This is used only by blit kernel - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } }, // sRBG { { CL_sRGB, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Srgb }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8Y8Z8W8_Srgb, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } }, { { CL_sRGB, CL_UNSIGNED_INT8 }, // This is used only by blit kernel - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } }, // sRBGx { { CL_sRGBx, CL_UNORM_INT8 }, - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Srgb }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8Y8Z8W8_Srgb, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } }, { { CL_sRGBx, CL_UNSIGNED_INT8 }, // This is used only by blit kernel - { Pal::ChFmt::R8G8B8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } }, // sBGRA { { CL_sBGRA, CL_UNORM_INT8 }, - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Srgb }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Srgb, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, { { CL_sBGRA, CL_UNSIGNED_INT8 }, // This is used only by blit kernel - { Pal::ChFmt::B8G8R8A8, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } }, + Pal::ChNumFormat::X8Y8Z8W8_Uint, + { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } }, // DEPTH { { CL_DEPTH, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_DEPTH, CL_UNSIGNED_INT32 }, // This is used only by blit kernel - { Pal::ChFmt::R32, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X32_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_DEPTH, CL_UNORM_INT16 }, - { Pal::ChFmt::R16, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X16_Unorm, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_DEPTH, CL_UNSIGNED_INT16 }, // This is used only by blit kernel - { Pal::ChFmt::R16, Pal::NumFmt::Uint }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X16_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_DEPTH_STENCIL, CL_UNORM_INT24 }, - { Pal::ChFmt::R32, Pal::NumFmt::Unorm }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }, + Pal::ChNumFormat::X32_Uint, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }, { { CL_DEPTH_STENCIL, CL_FLOAT }, - { Pal::ChFmt::R32, Pal::NumFmt::Float }, - { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R, - Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } } + Pal::ChNumFormat::X32_Float, + { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, + Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } } }; } // namespace pal diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index 75feb57feb..64e9c91c53 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -1040,6 +1040,7 @@ Device::init() size_t size = Pal::GetPlatformSize(); platformObj = new char[size]; Pal::PlatformCreateInfo info = {}; + //info.flags.disableGpuTimeout = true; info.pSettingsPath = "OCL"; // PAL init @@ -1106,7 +1107,7 @@ Device::xferMgr() const return xferQueue_->blitMgr(); } -Pal::Format +Pal::ChNumFormat Device::getPalFormat(const amd::Image::Format& format, Pal::ChannelMapping* channel) const { // Find PAL format diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.hpp b/projects/clr/rocclr/runtime/device/pal/paldevice.hpp index 29c5c7efed..6bbd1bc50d 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.hpp @@ -421,7 +421,7 @@ public: VirtualGPU* xferQueue() const { return xferQueue_; } //! Retrieves the internal format from the OCL format - Pal::Format getPalFormat( + Pal::ChNumFormat getPalFormat( const amd::Image::Format& format, //! OCL image format Pal::ChannelMapping* channel ) const; diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.cpp b/projects/clr/rocclr/runtime/device/pal/palresource.cpp index 94efefcec4..29269710b8 100644 --- a/projects/clr/rocclr/runtime/device/pal/palresource.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palresource.cpp @@ -172,8 +172,8 @@ Resource::Resource( desc_.state_ = 0; desc_.type_ = Empty; desc_.width_ = amd::alignUp(size, - Pal::Formats::BytesPerPixel(Pal::ChFmt::R32)) / - Pal::Formats::BytesPerPixel(Pal::ChFmt::R32); + Pal::Formats::BytesPerPixel(Pal::ChNumFormat::X32_Uint)) / + Pal::Formats::BytesPerPixel(Pal::ChNumFormat::X32_Uint); desc_.height_ = 1; desc_.depth_ = 1; desc_.mipLevels_ = 1; @@ -397,7 +397,7 @@ Resource::create(MemoryType memType, CreateParams* params) Pal::SubresId ImgSubresId = { Pal::ImageAspect::Color, 0, 0 }; Pal::SubresRange ImgSubresRange = { ImgSubresId, 1, 1 }; Pal::ChannelMapping channels; - Pal::Format format = dev().getPalFormat(desc().format_, &channels); + Pal::ChNumFormat format = dev().getPalFormat(desc().format_, &channels); // This is a thread safe operation const_cast(dev()).initializeHeapResources(); @@ -412,7 +412,7 @@ Resource::create(MemoryType memType, CreateParams* params) } // Get the element size - elementSize_ = Pal::Formats::BytesPerPixel(format.chFmt); + elementSize_ = Pal::Formats::BytesPerPixel(format); desc_.type_ = memType; if (memType == Scratch) { // use local memory for scratch buffer unless it is using HW DEBUG @@ -510,7 +510,8 @@ Resource::create(MemoryType memType, CreateParams* params) Pal::ImageCreateInfo imgCreateInfo = {}; Pal::ExternalImageOpenInfo imgOpenInfo = {}; imgOpenInfo.resourceInfo = openInfo; - imgOpenInfo.format = format; + imgOpenInfo.swizzledFormat.format = format; + imgOpenInfo.swizzledFormat.swizzle = channels; imgOpenInfo.flags.formatChangeSrd = true; imgOpenInfo.usage.shaderRead = true; imgOpenInfo.usage.shaderWrite = true; @@ -532,7 +533,8 @@ Resource::create(MemoryType memType, CreateParams* params) imgCreateInfo.flags.formatChangeSrd = true; imgCreateInfo.usageFlags.shaderRead = true; imgCreateInfo.usageFlags.shaderWrite = true; - imgCreateInfo.format = format; + imgCreateInfo.swizzledFormat.format = format; + imgCreateInfo.swizzledFormat.swizzle = channels; imgCreateInfo.mipLevels = 1; imgCreateInfo.samples = 1; imgCreateInfo.fragments = 1; @@ -607,8 +609,8 @@ Resource::create(MemoryType memType, CreateParams* params) Pal::ImageViewInfo viewInfo = {}; viewInfo.viewType = Pal::ImageViewType::Tex2d; viewInfo.pImage = image_; - viewInfo.format = format; - viewInfo.channels = channels; + viewInfo.swizzledFormat.format = format; + viewInfo.swizzledFormat.swizzle = channels; viewInfo.subresRange = ImgSubresRange; dev().iDev()->CreateImageViewSrds(1, &viewInfo, hwState_); @@ -627,7 +629,8 @@ Resource::create(MemoryType memType, CreateParams* params) viewInfo.gpuAddr = memRef_->iMem()->Desc().gpuVirtAddr + offset(); viewInfo.range = memRef_->iMem()->Desc().size; viewInfo.stride = elementSize(); - viewInfo.format = format; + viewInfo.swizzledFormat.format = format; + viewInfo.swizzledFormat.swizzle = channels; hwSrd_ = dev().srds().allocSrdSlot(reinterpret_cast(&hwState_)); if ((0 == hwSrd_) && (memoryType() != ImageView)) { return false; @@ -643,7 +646,8 @@ Resource::create(MemoryType memType, CreateParams* params) Pal::ExternalImageOpenInfo imgOpenInfo = {}; Pal::ImageCreateInfo imgCreateInfo = {}; imgOpenInfo.resourceInfo = openInfo; - imgOpenInfo.format = format; + imgOpenInfo.swizzledFormat.format = format; + imgOpenInfo.swizzledFormat.swizzle = channels; imgOpenInfo.flags.formatChangeSrd = true; imgOpenInfo.usage.shaderRead = true; imgOpenInfo.usage.shaderWrite = true; @@ -668,8 +672,8 @@ Resource::create(MemoryType memType, CreateParams* params) break; } viewInfo.pImage = image_; - viewInfo.format = format; - viewInfo.channels = channels; + viewInfo.swizzledFormat.format = format; + viewInfo.swizzledFormat.swizzle = channels; if ((type == InteropTextureViewLevel) || (type == InteropTextureViewCube)) { ImgSubresRange.startSubres.mipLevel = mipLevel; @@ -730,7 +734,8 @@ Resource::create(MemoryType memType, CreateParams* params) viewInfo.gpuAddr = memRef_->iMem()->Desc().gpuVirtAddr + offset(); viewInfo.range = memRef_->iMem()->Desc().size; viewInfo.stride = elementSize(); - viewInfo.format = format; + viewInfo.swizzledFormat.format = format; + viewInfo.swizzledFormat.swizzle = channels; //viewInfo.channels = channels; hwSrd_ = dev().srds().allocSrdSlot(reinterpret_cast(&hwState_)); if ((0 == hwSrd_) && (memoryType() != ImageView)) { @@ -798,8 +803,9 @@ Resource::create(MemoryType memType, CreateParams* params) imgCreateInfo.flags.formatChangeSrd = true; imgCreateInfo.usageFlags.shaderRead = true; imgCreateInfo.usageFlags.shaderWrite = - (format.numFmt == Pal::NumFmt::Srgb) ? false : true; - imgCreateInfo.format = format; + (format == Pal::ChNumFormat::X8Y8Z8W8_Srgb) ? false : true; + imgCreateInfo.swizzledFormat.format = format; + imgCreateInfo.swizzledFormat.swizzle = channels; imgCreateInfo.mipLevels = (desc_.mipLevels_) ? desc_.mipLevels_ : 1; imgCreateInfo.samples = 1; imgCreateInfo.fragments = 1; @@ -868,8 +874,8 @@ Resource::create(MemoryType memType, CreateParams* params) return false; } viewInfo.pImage = image_; - viewInfo.format = format; - viewInfo.channels = channels; + viewInfo.swizzledFormat.format = format; + viewInfo.swizzledFormat.swizzle = channels; viewInfo.subresRange = ImgSubresRange; dev().iDev()->CreateImageViewSrds(1, &viewInfo, hwState_); @@ -1101,22 +1107,22 @@ Resource::writeRawData( gpu.waitForEvent(&event); } } -static const Pal::ChFmt ChannelFmt(uint bytesPerElement) +static const Pal::ChNumFormat ChannelFmt(uint bytesPerElement) { if (bytesPerElement == 16) { - return Pal::ChFmt::R32G32B32A32; + return Pal::ChNumFormat::X32Y32Z32W32_Uint; } else if (bytesPerElement == 8) { - return Pal::ChFmt::R32G32; + return Pal::ChNumFormat::X32Y32_Uint; } else if (bytesPerElement == 4) { - return Pal::ChFmt::R32; + return Pal::ChNumFormat::X32_Uint; } else if (bytesPerElement == 2) { - return Pal::ChFmt::R16; + return Pal::ChNumFormat::X16_Uint; } else { - return Pal::ChFmt::R8; + return Pal::ChNumFormat::X8_Uint; } } @@ -1135,19 +1141,10 @@ Resource::partialMemCopyTo( bool result = true; EngineType activeEngineID = gpu.engineID_; static const bool waitOnBusyEngine = true; - // \note timing issues in Linux with sync mode - bool flush = true; - // Check if runtime can use async memory copy, - // even if a caller didn't request async - if (!desc().cardMemory_ || !dstResource.desc().cardMemory_) { - // Switch to SDMA engine - gpu.engineID_ = SdmaEngine; - flush = false; - } - else { - assert("Unsupported configuraiton!"); - } + assert(!(desc().cardMemory_ && dstResource.desc().cardMemory_) && + "Unsupported configuraiton!"); + gpu.engineID_ = SdmaEngine; // Wait for the resources, since runtime may use async transfers wait(gpu, waitOnBusyEngine); @@ -1233,16 +1230,18 @@ Resource::partialMemCopyTo( else { if (enableCopyRect) { Pal::TypedBufferCopyRegion copyRegion = {}; - copyRegion.srcBuffer.format.chFmt = ChannelFmt(bytesPerElement); - copyRegion.srcBuffer.format.numFmt = Pal::NumFmt::Uint; + Pal::ChannelMapping channels = { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, + Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W }; + copyRegion.srcBuffer.swizzledFormat.format = ChannelFmt(bytesPerElement); + copyRegion.srcBuffer.swizzledFormat.swizzle = channels; copyRegion.srcBuffer.offset = calSrcOrigin[0] + offset(); copyRegion.srcBuffer.rowPitch = calSrcOrigin[1]; copyRegion.srcBuffer.depthPitch = calSrcOrigin[2]; copyRegion.extent.width = calSize[0] / bytesPerElement; copyRegion.extent.height = calSize[1]; copyRegion.extent.depth = calSize[2]; - copyRegion.dstBuffer.format.chFmt = ChannelFmt(bytesPerElement); - copyRegion.dstBuffer.format.numFmt = Pal::NumFmt::Uint; + copyRegion.dstBuffer.swizzledFormat.format = ChannelFmt(bytesPerElement); + copyRegion.dstBuffer.swizzledFormat.swizzle = channels; copyRegion.dstBuffer.offset = calDstOrigin[0] + dstResource.offset(); copyRegion.dstBuffer.rowPitch = calDstOrigin[1]; copyRegion.dstBuffer.depthPitch = calDstOrigin[2]; @@ -1267,7 +1266,7 @@ Resource::partialMemCopyTo( dstResource.setBusy(gpu, event); // Update the global GPU event - gpu.setGpuEvent(event, (flush | flushDMA)); + gpu.setGpuEvent(event, flushDMA); } // Restore the original engine diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.hpp b/projects/clr/rocclr/runtime/device/pal/palresource.hpp index bb953b5a0d..5d89ca9850 100644 --- a/projects/clr/rocclr/runtime/device/pal/palresource.hpp +++ b/projects/clr/rocclr/runtime/device/pal/palresource.hpp @@ -361,7 +361,7 @@ public: uint64_t hwSrd() const { return hwSrd_; } uint numComponents() const { - return Pal::Formats::NumComponents(image_->GetImageCreateInfo().format.chFmt); } + return Pal::Formats::NumComponents(image_->GetImageCreateInfo().swizzledFormat.format); } protected: uint elementSize_; //!< Size of a single element in bytes diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp index 3ff86e744d..c3154a3bfb 100644 --- a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp @@ -170,7 +170,7 @@ VirtualGPU::Queue::submit(bool forceFlush) bool VirtualGPU::Queue::flush() { - std::vector memRef; + std::vector memRefs; // Stop commands building if (Pal::Result::Success != iCmdBuffs_[cmdBufIdSlot_]->End()) { LogError("PAL failed to finalize a command buffer!"); @@ -180,12 +180,14 @@ VirtualGPU::Queue::flush() for (auto it = memReferences_.begin(); it != memReferences_.end(); ++it) { if (it->second & FirstMemoryReference) { it->second &= ~FirstMemoryReference; - memRef.push_back(it->first); + Pal::GpuMemoryRef memRef = {}; + memRef.pGpuMemory = it->first; + memRefs.push_back(memRef); } } - if (memRef.size() != 0) { - iDev_->AddGpuMemoryReferences(memRef.size(), &memRef[0], iQueue_, + if (memRefs.size() != 0) { + iDev_->AddGpuMemoryReferences(memRefs.size(), &memRefs[0], iQueue_, Pal::GpuMemoryRefCantTrim); } @@ -254,19 +256,20 @@ VirtualGPU::Queue::flush() return false; } - memRef.clear(); + memRefs.clear(); + std::vector iMems; // Remove old memory references for (auto it = memReferences_.begin(); it != memReferences_.end();) { if (it->second == cmdBufIdSlot_) { - memRef.push_back(it->first); + iMems.push_back(it->first); it = memReferences_.erase(it); } else { ++it; } } - if (memRef.size() != 0) { - iDev_->RemoveGpuMemoryReferences(memRef.size(), &memRef[0], iQueue_); + if (iMems.size() != 0) { + iDev_->RemoveGpuMemoryReferences(iMems.size(), &iMems[0], iQueue_); } return true; diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp index be8539746a..c35bcb6318 100644 --- a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp +++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp @@ -69,7 +69,9 @@ public: void addMemRef(Pal::IGpuMemory* iMem) const { - iDev_->AddGpuMemoryReferences(1, &iMem, NULL, + Pal::GpuMemoryRef memRef = {}; + memRef.pGpuMemory = iMem; + iDev_->AddGpuMemoryReferences(1, &memRef, NULL, Pal::GpuMemoryRefCantTrim); } void removeMemRef(Pal::IGpuMemory* iMem) const