From 7de184cd647aada7092b6c86a5155c7d0fb39701 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 2 Mar 2015 19:20:37 -0500 Subject: [PATCH] P4 to Git Change 1126570 by gandryey@gera-dev-w7 on 2015/03/02 18:19:35 ECR #304775 - In addition to CL#1126564 - Keep just tile index field from the parent Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#209 edit [ROCm/clr commit: a8349b692f59e9e87d9ed3dc1a72a79ee115c47d] --- projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp index c182948c04..987ebb2d4d 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuresource.cpp @@ -1005,7 +1005,8 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap) if ((memoryType() == ImageView) && (viewChannelOrder == GSL_CHANNEL_ORDER_REPLICATE_R)) { if ((hwState_[3] & 0x1f00000) == 0xe00000) { - hwState_[3] = (hwState_[3] & 0xfe0fffff) | viewOwner_->hwState_[3]; + hwState_[3] = (hwState_[3] & 0xfe0fffff) | + (viewOwner_->hwState_[3] & 0x1f00000); } } hwState_[11] = 0; // one extra reserved field in the argument