PhysX 3.4 / APEX 1.4 release candidate @21506124

7 files changed, 0 insertions, 256 deletions

diff --git a/APEX_1.4/module/basicios/cuda/include/common.h b/APEX_1.4/module/basicios/cuda/include/common.h
deleted file mode 100644
index e530b9bc..00000000
--- a/APEX_1.4/module/basicios/cuda/include/common.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-#define APEX_CUDA_MODULE_PREFIX BasicIOS_
-
-#include "ApexCuda.h"
-#include "InplaceTypes.h"
-#include "IofxManagerIntl.h"
-#include <float.h>
-
-#if PX_WINDOWS_FAMILY
-#pragma warning(push)
-#pragma warning(disable:4201)
-#pragma warning(disable:4408)
-#endif
-
-#include <vector_types.h>
-
-#if PX_WINDOWS_FAMILY
-#pragma warning(pop)
-#endif
-
-const unsigned int HISTOGRAM_BIN_COUNT = 256;
-const unsigned int HISTOGRAM_SIMULATE_BIN_COUNT = 512;	
-
-
-#define COMPACT_KERNEL_CONFIG (0, WARP_SIZE * 3)
-#define HISTOGRAM_KERNEL_CONFIG (0, HISTOGRAM_BIN_COUNT)
-#define REDUCE_KERNEL_CONFIG (0, WARP_SIZE * 4)
-#define SCAN_KERNEL_CONFIG (0, WARP_SIZE * 4)
-#define SIMULATE_KERNEL_CONFIG (0, HISTOGRAM_SIMULATE_BIN_COUNT)
-
-
-const unsigned int HOLE_SCAN_FLAG_BIT = 31;
-const unsigned int HOLE_SCAN_FLAG = (1U << HOLE_SCAN_FLAG_BIT);
-const unsigned int HOLE_SCAN_MASK = (HOLE_SCAN_FLAG - 1);
-
-// mTmpOutput
-const unsigned int STATUS_LAST_ACTIVE_COUNT		= 0;
-const unsigned int STATUS_LAST_BENEFIT_SUM		= 1;
-const unsigned int STATUS_LAST_BENEFIT_MIN		= 2;
-const unsigned int STATUS_LAST_BENEFIT_MAX		= 3;
-
-namespace nvidia
-{
-namespace basicios
-{
-
-}
-} // namespace nvidia
-
-#endif
diff --git a/APEX_1.4/module/basicios/cuda/include/compact.h b/APEX_1.4/module/basicios/cuda/include/compact.h
deleted file mode 100644
index f0313c09..00000000
--- a/APEX_1.4/module/basicios/cuda/include/compact.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-APEX_CUDA_TEXTURE_1D(texRefCompactScanSum, unsigned int)
-
-APEX_CUDA_BOUND_KERNEL(COMPACT_KERNEL_CONFIG, compactKernel,
-                       ((unsigned int, targetCount))((unsigned int, totalCount))((unsigned int, injectorCount))
-                       ((APEX_MEM_BLOCK(unsigned int), g_outIndices))((APEX_MEM_BLOCK(unsigned int), g_outCount))((APEX_MEM_BLOCK(unsigned int), g_injCounters))
-                      )
diff --git a/APEX_1.4/module/basicios/cuda/include/histogram.h b/APEX_1.4/module/basicios/cuda/include/histogram.h
deleted file mode 100644
index ca45aa5e..00000000
--- a/APEX_1.4/module/basicios/cuda/include/histogram.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-APEX_CUDA_SYNC_KERNEL(HISTOGRAM_KERNEL_CONFIG, histogramSyncKernel, ((unsigned int, count))
-                      ((const float*, g_data))((unsigned int, bound))
-                      ((float, dataMin))((float, dataMax))((unsigned int*, g_boundParams))
-                      ((unsigned int*, g_tmpHistograms))
-                     )
-
-APEX_CUDA_BOUND_KERNEL(HISTOGRAM_KERNEL_CONFIG, histogramKernel,
-                       ((APEX_MEM_BLOCK(float), g_data))((unsigned int, bound))
-                       ((float, dataMin))((float, dataMax))((APEX_MEM_BLOCK(unsigned int), g_boundParams))
-                       ((APEX_MEM_BLOCK(unsigned int), g_tmpHistograms))
-					   ((unsigned int, phase))((unsigned int, gridSize))
-                      )
diff --git a/APEX_1.4/module/basicios/cuda/include/moduleList.h b/APEX_1.4/module/basicios/cuda/include/moduleList.h
deleted file mode 100644
index 8a8749ce..00000000
--- a/APEX_1.4/module/basicios/cuda/include/moduleList.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-#include "compact.h"
-#include "histogram.h"
-#include "reduce.h"
-#include "scan.h"
-#include "simulate.h"
diff --git a/APEX_1.4/module/basicios/cuda/include/reduce.h b/APEX_1.4/module/basicios/cuda/include/reduce.h
deleted file mode 100644
index adde0ad7..00000000
--- a/APEX_1.4/module/basicios/cuda/include/reduce.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-APEX_CUDA_SYNC_KERNEL(REDUCE_KERNEL_CONFIG, reduceSyncKernel, ((unsigned int, count))
-                      ((float*, g_benefit))((float4*, g_output))((unsigned int*, g_tmp))
-                     )
-
-APEX_CUDA_BOUND_KERNEL(REDUCE_KERNEL_CONFIG, reduceKernel,
-                       ((APEX_MEM_BLOCK(float), g_benefit))((APEX_MEM_BLOCK(float4), g_output))((APEX_MEM_BLOCK(unsigned int), g_tmp))
-					   ((unsigned int, phase))((unsigned int, gridSize))
-                      )
diff --git a/APEX_1.4/module/basicios/cuda/include/scan.h b/APEX_1.4/module/basicios/cuda/include/scan.h
deleted file mode 100644
index 12553c5f..00000000
--- a/APEX_1.4/module/basicios/cuda/include/scan.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-APEX_CUDA_SYNC_KERNEL(SCAN_KERNEL_CONFIG, scanSyncKernel, ((unsigned int, count))
-                      ((float, benefitMin))((float, benefitMax))
-                      ((unsigned int*, g_indices))((const float*, g_benefits))
-                      ((unsigned int*, g_boundParams))
-                      ((unsigned int*, g_tmpCounts))((unsigned int*, g_tmpCounts1))
-                     )
-
-APEX_CUDA_BOUND_KERNEL(SCAN_KERNEL_CONFIG, scanKernel,
-                       ((float, benefitMin))((float, benefitMax))
-                       ((APEX_MEM_BLOCK(unsigned int), g_indices))((APEX_MEM_BLOCK(float), g_benefits))
-                       ((APEX_MEM_BLOCK(unsigned int), g_boundParams))
-                       ((APEX_MEM_BLOCK(unsigned int), g_tmpCounts))((APEX_MEM_BLOCK(unsigned int), g_tmpCounts1))
-					   ((unsigned int, phase))((unsigned int, gridSize))
-                      )
diff --git a/APEX_1.4/module/basicios/cuda/include/simulate.h b/APEX_1.4/module/basicios/cuda/include/simulate.h
deleted file mode 100644
index 5ade0039..00000000
--- a/APEX_1.4/module/basicios/cuda/include/simulate.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-
-
-APEX_CUDA_STORAGE(simulateStorage)
-
-
-APEX_CUDA_TEXTURE_1D(texRefPositionMass,        float4)
-APEX_CUDA_TEXTURE_1D(texRefVelocityLife,        float4)
-APEX_CUDA_TEXTURE_1D(texRefIofxActorIDs,        unsigned int)
-APEX_CUDA_TEXTURE_1D(texRefLifeSpan,            float)
-APEX_CUDA_TEXTURE_1D(texRefLifeTime,            float)
-APEX_CUDA_TEXTURE_1D(texRefInjector,            unsigned int)
-
-APEX_CUDA_TEXTURE_1D(texRefUserData,            unsigned int)
-
-APEX_CUDA_TEXTURE_1D(texRefConvexPlanes,        float4)
-APEX_CUDA_TEXTURE_1D(texRefConvexVerts,         float4)
-APEX_CUDA_TEXTURE_1D(texRefConvexPolygonsData,  unsigned int)
-
-APEX_CUDA_TEXTURE_1D(texRefTrimeshIndices,      unsigned int)
-APEX_CUDA_TEXTURE_1D(texRefTrimeshVerts,        float4)
-
-APEX_CUDA_TEXTURE_1D(texRefHoleScanSum,         unsigned int)
-APEX_CUDA_TEXTURE_1D(texRefMoveIndices,         unsigned int)
-
-APEX_CUDA_TEXTURE_1D(texRefField,               float4)
-
-
-APEX_CUDA_BOUND_KERNEL(SIMULATE_KERNEL_CONFIG, simulateKernel,
-                       ((unsigned int, lastCount))((float, deltaTime))((physx::PxVec3, gravity))((physx::PxVec3, eyePos))
-                       ((InplaceHandle<InjectorParamsArray>, injectorParamsArrayHandle))((unsigned int, injectorCount))
-                       ((unsigned int*, g_holeScanSum))((unsigned int*, g_moveCount))((unsigned int*, g_tmpHistogram))((unsigned int*, g_InjectorsCounters))
-                       ((float4*, g_positionMass))((float4*, g_velocityLife))((float4*, g_collisionNormalFlags))((unsigned int*, g_userData))
-                       ((float*, g_lifeSpan))((float*, g_lifeTime))((unsigned int*, g_injector))((IofxActorIDIntl*, g_iofxActorIDs))
-                       ((float*, g_benefit))((InplaceHandle<SimulationParams>, paramsHandle))
-                      )
-
-APEX_CUDA_BOUND_KERNEL(SIMULATE_KERNEL_CONFIG, simulateApplyFieldKernel,
-                       ((unsigned int, lastCount))((float, deltaTime))((physx::PxVec3, gravity))((physx::PxVec3, eyePos))
-                       ((InplaceHandle<InjectorParamsArray>, injectorParamsArrayHandle))((unsigned int, injectorCount))
-                       ((APEX_MEM_BLOCK(unsigned int), g_holeScanSum))((APEX_MEM_BLOCK(unsigned int), g_moveCount))
-					   ((APEX_MEM_BLOCK(unsigned int), g_tmpHistogram))((APEX_MEM_BLOCK(unsigned int), g_InjectorsCounters))
-                       ((APEX_MEM_BLOCK(float4), g_positionMass))((APEX_MEM_BLOCK(float4), g_velocityLife))
-					   ((APEX_MEM_BLOCK(float4), g_collisionNormalFlags))((APEX_MEM_BLOCK(unsigned int), g_userData))
-                       ((APEX_MEM_BLOCK(float), g_lifeSpan))((APEX_MEM_BLOCK(float), g_lifeTime))
-					   ((APEX_MEM_BLOCK(unsigned int), g_injector))((APEX_MEM_BLOCK(IofxActorIDIntl), g_iofxActorIDs))
-                       ((APEX_MEM_BLOCK(float), g_benefit))((InplaceHandle<SimulationParams>, paramsHandle))
-                      )
-
-
-APEX_CUDA_BOUND_KERNEL((), mergeHistogramKernel,
-                       ((APEX_MEM_BLOCK(unsigned int), g_InjectorsCounters))
-					   ((APEX_MEM_BLOCK(unsigned int), g_tmpHistograms))
-					   ((unsigned int, gridSize))((unsigned int, injectorCount))
-                      )
-
-APEX_CUDA_BOUND_KERNEL((), stateKernel,
-                       ((unsigned int, lastCount))((unsigned int, targetCount))
-                       ((APEX_MEM_BLOCK(unsigned int), g_moveCount))
-                       ((APEX_MEM_BLOCK(unsigned int), g_inStateToInput))((APEX_MEM_BLOCK(unsigned int), g_outStateToInput))
-                      )
-
-APEX_CUDA_BOUND_KERNEL((), gridDensityGridClearKernel,
-						((float*, gridDensityGrid))((GridDensityParams, params))
-						)
-
-APEX_CUDA_BOUND_KERNEL((), gridDensityGridFillKernel,
-						((float4*, positionMass))((float*, gridDensityGrid))((GridDensityParams, params))
-						)
-
-APEX_CUDA_BOUND_KERNEL((), gridDensityGridApplyKernel,
-						((float*, density))((float4*, positionMass))((float*, gridDensityGrid))((GridDensityParams, params))
-						)
-
-APEX_CUDA_BOUND_KERNEL((), gridDensityGridFillFrustumKernel,
-						((float4*, positionMass))((float*, gridDensityGrid))((GridDensityParams, params))((::physx::PxMat44,mat))((GridDensityFrustumParams,frustum))
-						)
-
-APEX_CUDA_BOUND_KERNEL((), gridDensityGridApplyFrustumKernel,
-						((float*, density))((float4*, positionMass))((float*, gridDensityGrid))((GridDensityParams, params))((::physx::PxMat44,mat))((GridDensityFrustumParams,frustum))
-						)
-
-APEX_CUDA_FREE_KERNEL((), gridDensityGridLowPassKernel,
-						((float*, gridDensityGridIn))((float*, gridDensityGridOut))((GridDensityParams, params))
-						)
\ No newline at end of file