From 11d6f836d096c433b08fd1b95f8b5034392450c2 Mon Sep 17 00:00:00 2001 From: Bruce Cherniak Date: Fri, 3 Feb 2017 11:35:59 -0600 Subject: [PATCH] swr: [rasterizer core] Removed unused clip code. Removed unused Clip() and FRUSTUM_CLIP_MASK define. Reviewed-by: Tim Rowley --- .../drivers/swr/rasterizer/core/clip.cpp | 22 ------------------- .../drivers/swr/rasterizer/core/clip.h | 4 ---- 2 files changed, 26 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/core/clip.cpp b/src/gallium/drivers/swr/rasterizer/core/clip.cpp index 7b1e09d16e0..0a6afe5909d 100644 --- a/src/gallium/drivers/swr/rasterizer/core/clip.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/clip.cpp @@ -157,28 +157,6 @@ int ClipTriToPlane( const float *pInPts, int numInPts, return i; } - - -void Clip(const float *pTriangle, const float *pAttribs, int numAttribs, float *pOutTriangles, int *numVerts, float *pOutAttribs) -{ - // temp storage to hold at least 6 sets of vertices, the max number that can be created during clipping - OSALIGNSIMD(float) tempPts[6 * 4]; - OSALIGNSIMD(float) tempAttribs[6 * KNOB_NUM_ATTRIBUTES * 4]; - - // we opt to clip to viewport frustum to produce smaller triangles for rasterization precision - int NumOutPts = ClipTriToPlane(pTriangle, 3, pAttribs, numAttribs, tempPts, tempAttribs); - NumOutPts = ClipTriToPlane(tempPts, NumOutPts, tempAttribs, numAttribs, pOutTriangles, pOutAttribs); - NumOutPts = ClipTriToPlane(pOutTriangles, NumOutPts, pOutAttribs, numAttribs, tempPts, tempAttribs); - NumOutPts = ClipTriToPlane(tempPts, NumOutPts, tempAttribs, numAttribs, pOutTriangles, pOutAttribs); - NumOutPts = ClipTriToPlane(pOutTriangles, NumOutPts, pOutAttribs, numAttribs, tempPts, tempAttribs); - NumOutPts = ClipTriToPlane(tempPts, NumOutPts, tempAttribs, numAttribs, pOutTriangles, pOutAttribs); - - SWR_ASSERT(NumOutPts <= 6); - - *numVerts = NumOutPts; - return; -} - void ClipTriangles(DRAW_CONTEXT *pDC, PA_STATE& pa, uint32_t workerId, simdvector prims[], uint32_t primMask, simdscalari primId, simdscalari viewportIdx) { SWR_CONTEXT *pContext = pDC->pContext; diff --git a/src/gallium/drivers/swr/rasterizer/core/clip.h b/src/gallium/drivers/swr/rasterizer/core/clip.h index f19858f932b..23a768f4832 100644 --- a/src/gallium/drivers/swr/rasterizer/core/clip.h +++ b/src/gallium/drivers/swr/rasterizer/core/clip.h @@ -56,12 +56,8 @@ enum SWR_CLIPCODES GUARDBAND_BOTTOM = (0x80 << CLIPCODE_SHIFT | 0x8) }; -#define FRUSTUM_CLIP_MASK (FRUSTUM_LEFT|FRUSTUM_TOP|FRUSTUM_RIGHT|FRUSTUM_BOTTOM|FRUSTUM_NEAR|FRUSTUM_FAR) #define GUARDBAND_CLIP_MASK (FRUSTUM_NEAR|FRUSTUM_FAR|GUARDBAND_LEFT|GUARDBAND_TOP|GUARDBAND_RIGHT|GUARDBAND_BOTTOM|NEGW) -void Clip(const float *pTriangle, const float *pAttribs, int numAttribs, float *pOutTriangles, - int *numVerts, float *pOutAttribs); - INLINE void ComputeClipCodes(const API_STATE& state, const simdvector& vertex, simdscalar& clipCodes, simdscalari viewportIndexes) { -- 2.30.2