summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorGreg V <[email protected]>2017-12-31 19:55:27 +0300
committerEmil Velikov <[email protected]>2018-01-19 16:15:56 +0000
commit8ff8c82630ccef75c13c84b5b32b45dda976f4ec (patch)
treed2d56dc2f5d254400480f0591b0c33826e28e311 /src/gallium/drivers
parentea89843b3d31313f3b3e9ddfd6e8744edb7545d6 (diff)
swr: fix clang 5 null cast warning
Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
index 6c801c7ff69..abb0c53ec41 100644
--- a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
+++ b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
@@ -624,7 +624,7 @@ uint32_t TileSwizzle2D(uint32_t xOffsetBytes, uint32_t yOffsetRows, const SWR_SU
case SWR_TILE_MODE_WMAJOR: return ComputeTileSwizzle2D<TilingTraits<SWR_TILE_MODE_WMAJOR, 8> >(xOffsetBytes, yOffsetRows, pState);
default: SWR_INVALID("Unsupported tiling mode");
}
- return (uint32_t) NULL;
+ return 0;
}
//////////////////////////////////////////////////////////////////////////
@@ -644,7 +644,7 @@ uint32_t TileSwizzle3D(uint32_t xOffsetBytes, uint32_t yOffsetRows, uint32_t zOf
case SWR_TILE_MODE_YMAJOR: return ComputeTileSwizzle3D<TilingTraits<SWR_TILE_MODE_YMAJOR, 32> >(xOffsetBytes, yOffsetRows, zOffsetSlices, pState);
default: SWR_INVALID("Unsupported tiling mode");
}
- return (uint32_t) NULL;
+ return 0;
}
template<bool UseCachedOffsets>
@@ -677,7 +677,7 @@ uint32_t ComputeSurfaceOffset(uint32_t x, uint32_t y, uint32_t z, uint32_t array
default: SWR_INVALID("Unsupported format");
}
- return (uint32_t) NULL;
+ return 0;
}
typedef void*(*PFN_COMPUTESURFADDR)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, const SWR_SURFACE_STATE*);