diff options
| author | Tim Rowley <[email protected]> | 2016-03-07 10:51:56 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-03-25 14:43:14 -0500 |
| commit | 643857f596529f4887eaa13e5d336efd6da371ad (patch) | |
| tree | 4e949913e83500a09dd17ab6f097f9091d1005e1 | |
| parent | 3252fe3705376063f94a7717c07b9824b5d43f46 (diff) | |
swr: [rasterizer] remove use of FLOAT type
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/os.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/core/api.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/memory/ClearTile.cpp | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index 140d6129322..6c44d7b625c 100644 --- a/src/gallium/drivers/swr/rasterizer/common/os.h +++ b/src/gallium/drivers/swr/rasterizer/common/os.h @@ -81,7 +81,6 @@ typedef int INT; typedef unsigned int UINT; typedef uint64_t UINT64; typedef void* HANDLE; -typedef float FLOAT; typedef int LONG; typedef unsigned char UCHAR; typedef unsigned int DWORD; diff --git a/src/gallium/drivers/swr/rasterizer/core/api.h b/src/gallium/drivers/swr/rasterizer/core/api.h index 9c046776bb8..14ec0f98e7d 100644 --- a/src/gallium/drivers/swr/rasterizer/core/api.h +++ b/src/gallium/drivers/swr/rasterizer/core/api.h @@ -425,7 +425,7 @@ void SWR_API SwrStoreTiles( void SWR_API SwrClearRenderTarget( HANDLE hContext, uint32_t clearMask, - const FLOAT clearColor[4], + const float clearColor[4], float z, BYTE stencil); diff --git a/src/gallium/drivers/swr/rasterizer/memory/ClearTile.cpp b/src/gallium/drivers/swr/rasterizer/memory/ClearTile.cpp index ad73cd840a7..0306f796e57 100644 --- a/src/gallium/drivers/swr/rasterizer/memory/ClearTile.cpp +++ b/src/gallium/drivers/swr/rasterizer/memory/ClearTile.cpp @@ -33,7 +33,7 @@ #include "memory/tilingtraits.h" #include "memory/Convert.h" -typedef void(*PFN_STORE_TILES_CLEAR)(const FLOAT*, SWR_SURFACE_STATE*, UINT, UINT); +typedef void(*PFN_STORE_TILES_CLEAR)(const float*, SWR_SURFACE_STATE*, UINT, UINT); ////////////////////////////////////////////////////////////////////////// /// Clear Raster Tile Function Tables. @@ -104,7 +104,7 @@ struct StoreMacroTileClear /// @param pDstSurface - Destination surface state /// @param x, y - Coordinates to macro tile static void StoreClear( - const FLOAT *pColor, + const float *pColor, SWR_SURFACE_STATE* pDstSurface, UINT x, UINT y) { @@ -112,7 +112,7 @@ struct StoreMacroTileClear BYTE dstFormattedColor[16]; // max bpp is 128, so 16 is all we need here for one pixel - FLOAT srcColor[4]; + float srcColor[4]; for (UINT comp = 0; comp < FormatTraits<DstFormat>::numComps; ++comp) { |