Some misc changes.

woachk · Feb 18, 2019 · 8192746 · 8192746
1 parent 8e357ed
commit 8192746
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/render-only-sample/roskmd/RosKmdAdapter.cpp b/render-only-sample/roskmd/RosKmdAdapter.cpp
@@ -1917,12 +1917,7 @@ NTSTATUS RosKmAdapter::GetStandardAllocationDriverData (
         allocParams->m_hwLayout = RosHwLayout::Linear;
         allocParams->m_hwWidthPixels = surfData->Width;
         allocParams->m_hwHeightPixels = surfData->Height;
-
-		allocParams->m_hwFormat = RosHwFormat::X8888;
-		allocParams->m_hwPitchBytes = surfData->Width * 4;
-		allocParams->m_hwSizeBytes = allocParams->m_hwPitchBytes * surfData->Height;
-		allocParams->m_hwFormat = RosHwFormat::X8888;
-        //allocParams->m_hwSizeBytes = surfData->Width * 4 * surfData->Height;
+        allocParams->m_hwSizeBytes = surfData->Width * 4 * surfData->Height;
 
         return STATUS_SUCCESS;
     }
@@ -1966,11 +1961,8 @@ NTSTATUS RosKmAdapter::GetStandardAllocationDriverData (
         allocParams->m_primaryDesc.DriverFlags = 0;
         allocParams->m_hwLayout = RosHwLayout::Linear;
         allocParams->m_hwWidthPixels = surfData->Width;
-        allocParams->m_hwHeightPixels = surfData->Height;
-		allocParams->m_hwFormat = RosHwFormat::X8888;
-		allocParams->m_hwPitchBytes = surfData->Width * 4;
-		allocParams->m_hwSizeBytes = allocParams->m_hwPitchBytes * surfData->Height;
-        //allocParams->m_hwSizeBytes = surfData->Width * 4 * surfData->Height;
+		allocParams->m_hwHeightPixels = surfData->Height;
+        allocParams->m_hwSizeBytes = surfData->Width * 4 * surfData->Height;
 
         Args->pCreateShadowSurfaceData->Pitch = surfData->Width * 4; //allocParams->m_hwPitchBytes;
         return STATUS_SUCCESS;

diff --git a/render-only-sample/rosumd/RosUmdResource.cpp b/render-only-sample/rosumd/RosUmdResource.cpp
@@ -514,11 +514,11 @@ RosUmdResource::CalculateMemoryLayout(
             // Disable tiled format until issue #48 is fixed.
             //
             // Force tiled layout for given configuration only
-            // if ((m_usage == D3D10_DDI_USAGE_DEFAULT) &&
-            //    (m_bindFlags == D3D10_DDI_BIND_SHADER_RESOURCE))
-            // {
-            //    m_hwLayout = RosHwLayout::Tiled;
-            // }
+            if ((m_usage == D3D10_DDI_USAGE_DEFAULT) &&
+                (m_bindFlags == D3D10_DDI_BIND_SHADER_RESOURCE))
+            {
+                m_hwLayout = RosHwLayout::Tiled;
+            }
 
             // Using system memory linear MipMap as example
             m_hwWidthPixels = m_mip0Info.TexelWidth;