From 618d8e61355ce6307d481105bf8843f53908f10c Mon Sep 17 00:00:00 2001 From: kgv Date: Fri, 1 Nov 2013 10:03:05 +0400 Subject: [PATCH] OpenGl_Workspace_Raytrace.cxx - include OpenGl_Cl.hxx first --- src/OpenGl/OpenGl_Workspace_Raytrace.cxx | 29 ++++++++---------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx index 534c7c3ec0..71eeed1988 100644 --- a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx +++ b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx @@ -23,6 +23,8 @@ #ifdef HAVE_OPENCL +#include + #if defined(_WIN32) #include @@ -617,29 +619,16 @@ Standard_Boolean OpenGl_Workspace::AddRaytraceVertexIndices (const CALL_DEF_PARR int theMatID) { myRaytraceSceneData.Triangles.reserve (myRaytraceSceneData.Triangles.size() + theVertNum); - switch (theArray->type) { - case TelTrianglesArrayType: - return AddRaytraceTriangleArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); - - case TelQuadranglesArrayType: - return AddRaytraceQuadrangleArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); - - case TelTriangleFansArrayType: - return AddRaytraceTriangleFanArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); - - case TelTriangleStripsArrayType: - return AddRaytraceTriangleStripArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); - - case TelQuadrangleStripsArrayType: - return AddRaytraceQuadrangleStripArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); - - case TelPolygonsArrayType: - return AddRaytracePolygonArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelTrianglesArrayType: return AddRaytraceTriangleArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelQuadranglesArrayType: return AddRaytraceQuadrangleArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelTriangleFansArrayType: return AddRaytraceTriangleFanArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelTriangleStripsArrayType: return AddRaytraceTriangleStripArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelQuadrangleStripsArrayType: return AddRaytraceQuadrangleStripArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + case TelPolygonsArrayType: return AddRaytracePolygonArray (theArray, theFirstVert, theVertOffset, theVertNum, theMatID); + default: return Standard_False; } - - return Standard_False; } // =======================================================================