From 6f0fcec07a16eb48ebdafffd0b4ae0bb5ac611a4 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Thu, 7 Sep 2017 15:17:23 -0500 Subject: swr/rast: Migrate memory pointers to gfxptr_t type Reviewed-by: Bruce Cherniak --- src/gallium/drivers/swr/rasterizer/memory/StoreTile.h | 4 ++-- src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/swr/rasterizer/memory') diff --git a/src/gallium/drivers/swr/rasterizer/memory/StoreTile.h b/src/gallium/drivers/swr/rasterizer/memory/StoreTile.h index c3d14e95092..512c3380270 100644 --- a/src/gallium/drivers/swr/rasterizer/memory/StoreTile.h +++ b/src/gallium/drivers/swr/rasterizer/memory/StoreTile.h @@ -1179,7 +1179,7 @@ struct StoreRasterTile resolveColor[3] *= oneOverNumSamples; // Use the resolve surface state - SWR_SURFACE_STATE* pResolveSurface = (SWR_SURFACE_STATE*)pDstSurface->pAuxBaseAddress; + SWR_SURFACE_STATE* pResolveSurface = (SWR_SURFACE_STATE*)pDstSurface->xpAuxBaseAddress; uint8_t *pDst = (uint8_t*)ComputeSurfaceAddress((x + rx), (y + ry), pResolveSurface->arrayIndex + renderTargetArrayIndex, pResolveSurface->arrayIndex + renderTargetArrayIndex, 0, pResolveSurface->lod, pResolveSurface); @@ -2390,7 +2390,7 @@ struct StoreMacroTile } } - if (pDstSurface->pAuxBaseAddress) + if (pDstSurface->xpAuxBaseAddress) { uint32_t sampleOffset = KNOB_TILE_X_DIM * KNOB_TILE_Y_DIM * (FormatTraits::bpp / 8); // Store each raster tile from the hot tile to the destination surface. diff --git a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h index 9222d3edfb8..6c801c7ff69 100644 --- a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h +++ b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h @@ -694,5 +694,5 @@ template INLINE void* ComputeSurfaceAddress(uint32_t x, uint32_t y, uint32_t z, uint32_t array, uint32_t sampleNum, uint32_t lod, const SWR_SURFACE_STATE *pState) { - return pState->pBaseAddress + ComputeSurfaceOffset(x, y, z, array, sampleNum, lod, pState); + return (void*)(pState->xpBaseAddress + ComputeSurfaceOffset(x, y, z, array, sampleNum, lod, pState)); } -- cgit v1.2.3