mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-12-12 03:50:09 +00:00
33bfbf699b
In OpenSubdiv 2.x, we encapsulated subdivision tables into compute context in osd layer since those tables are order-dependent and have to be applied in a certain manner. In 3.0, we adopted stencil table based refinement. It's more simple and such an encapsulation is no longer needed. Also 2.0 API has several ownership issues of GPU kernel caching, and forces unnecessary instantiation of controllers even though the cpu kernels typically don't need instances unlike GPU ones. This change completely revisit osd client facing APIs. All contexts and controllers were replaced with device-specific tables and evaluators. While we can still use consistent API across various device backends, unnecessary complexities have been removed. For example, cpu evaluator is just a set of static functions and also there's no need to replicate FarStencilTables to ComputeContext. Also the new API delegates the ownership of compiled GPU kernels to clients, for the better management of resources especially in multiple GPU environment. In addition to integrating ComputeController and EvalStencilController into a single function Evaluator::EvalStencils(), EvalLimit API is also added into Evaluator. This is working but still in progress, and we'll make a followup change for the complete implementation. -some naming convention changes: GLSLTransformFeedback to GLXFBEvaluator GLSLCompute to GLComputeEvaluator -move LimitLocation struct into examples/glEvalLimit. We're still discussing patch evaluation interface. Basically we'd like to tease all ptex-specific parametrization out of far/osd layer. TODO: -implments EvalPatches() in the right way -derivative evaluation API is still interim. -VertexBufferDescriptor needs a better API to advance its location -synchronization mechanism is not ideal (too global). -OsdMesh class is hacky. need to fix it.
347 lines
8.5 KiB
CMake
347 lines
8.5 KiB
CMake
#
|
|
# Copyright 2013 Pixar
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "Apache License")
|
|
# with the following modification; you may not use this file except in
|
|
# compliance with the Apache License and the following modification to it:
|
|
# Section 6. Trademarks. is deleted and replaced with:
|
|
#
|
|
# 6. Trademarks. This License does not grant permission to use the trade
|
|
# names, trademarks, service marks, or product names of the Licensor
|
|
# and its affiliates, except as required to comply with Section 4(c) of
|
|
# the License and to reproduce the content of the NOTICE file.
|
|
#
|
|
# You may obtain a copy of the Apache License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the Apache License with the above modification is
|
|
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the Apache License for the specific
|
|
# language governing permissions and limitations under the Apache License.
|
|
#
|
|
|
|
#-------------------------------------------------------------------------------
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# source & headers
|
|
set(CPU_SOURCE_FILES
|
|
cpuEvaluator.cpp
|
|
cpuKernel.cpp
|
|
cpuVertexBuffer.cpp
|
|
drawContext.cpp
|
|
drawRegistry.cpp
|
|
)
|
|
|
|
set(GPU_SOURCE_FILES )
|
|
|
|
set(INC_FILES )
|
|
|
|
set(PRIVATE_HEADER_FILES
|
|
debug.h
|
|
cpuKernel.h
|
|
)
|
|
|
|
set(PUBLIC_HEADER_FILES
|
|
cpuEvaluator.h
|
|
cpuVertexBuffer.h
|
|
mesh.h
|
|
nonCopyable.h
|
|
opengl.h
|
|
drawContext.h
|
|
drawRegistry.h
|
|
vertexDescriptor.h
|
|
)
|
|
|
|
set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
set(OPENMP_PUBLIC_HEADERS
|
|
ompEvaluator.h
|
|
ompKernel.h
|
|
)
|
|
|
|
if(OPENMP_FOUND )
|
|
list(APPEND CPU_SOURCE_FILES
|
|
ompEvaluator.cpp
|
|
ompKernel.cpp
|
|
)
|
|
|
|
list(APPEND PUBLIC_HEADER_FILES ${OPENMP_PUBLIC_HEADERS})
|
|
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
list(APPEND PLATFORM_CPU_LIBRARIES gomp)
|
|
endif()
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${OPENMP_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
set(TBB_PUBLIC_HEADERS
|
|
tbbEvaluator.h
|
|
tbbKernel.h
|
|
)
|
|
|
|
if( TBB_FOUND )
|
|
include_directories("${TBB_INCLUDE_DIR}")
|
|
|
|
list(APPEND CPU_SOURCE_FILES
|
|
tbbEvaluator.cpp
|
|
tbbKernel.cpp
|
|
)
|
|
|
|
list(APPEND PUBLIC_HEADER_FILES ${TBB_PUBLIC_HEADERS})
|
|
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
list(APPEND PLATFORM_CPU_LIBRARIES gomp)
|
|
endif()
|
|
|
|
list(APPEND PLATFORM_CPU_LIBRARIES
|
|
${TBB_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${TBB_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# GL code & dependencies
|
|
set(GL_PUBLIC_HEADERS
|
|
cpuGLVertexBuffer.h
|
|
glDrawContext.h
|
|
glDrawRegistry.h
|
|
glVertexBuffer.h
|
|
glMesh.h
|
|
)
|
|
|
|
if( OPENGL_FOUND OR OPENGLES_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
cpuGLVertexBuffer.cpp
|
|
glDrawContext.cpp
|
|
glDrawRegistry.cpp
|
|
glVertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${GL_PUBLIC_HEADERS})
|
|
if ( OPENGL_FOUND )
|
|
list(APPEND KERNEL_FILES
|
|
glslPatchCommon.glsl
|
|
glslPatchBSpline.glsl
|
|
glslPatchGregory.glsl
|
|
glslPatchGregoryBasis.glsl
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${GL_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# OpenGL 4.2 dependencies
|
|
# note : (GLSL transform feedback kernels require GL 4.2)
|
|
set(GL_4_2_PUBLIC_HEADERS
|
|
glXFBEvaluator.h
|
|
)
|
|
|
|
if( OPENGL_4_2_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
glXFBEvaluator.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
|
|
list(APPEND KERNEL_FILES
|
|
glslXFBKernel.glsl
|
|
)
|
|
list(APPEND PLATFORM_GPU_LIBRARIES
|
|
${GLEW_LIBRARY}
|
|
)
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
|
|
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# OpenGL 4.3 dependencies
|
|
# note : (GLSL compute shader kernels require GL 4.3)
|
|
set(GL_4_3_PUBLIC_HEADERS
|
|
glComputeEvaluator.h
|
|
)
|
|
|
|
if( OPENGL_4_3_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
glComputeEvaluator.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
|
|
list(APPEND KERNEL_FILES
|
|
glslComputeKernel.glsl
|
|
)
|
|
list(APPEND PLATFORM_GPU_LIBRARIES
|
|
${GLEW_LIBRARY}
|
|
)
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# DX11 code & dependencies
|
|
set(DXSDK_PUBLIC_HEADERS
|
|
cpuD3D11VertexBuffer.h
|
|
d3d11ComputeEvaluator.h
|
|
d3d11DrawContext.h
|
|
d3d11DrawRegistry.h
|
|
d3d11VertexBuffer.h
|
|
d3d11Mesh.h
|
|
)
|
|
if( DXSDK_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
cpuD3D11VertexBuffer.cpp
|
|
d3d11ComputeEvaluator.cpp
|
|
d3d11DrawContext.cpp
|
|
d3d11DrawRegistry.cpp
|
|
d3d11VertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${DXSDK_PUBLIC_HEADERS})
|
|
list(APPEND KERNEL_FILES
|
|
hlslComputeKernel.hlsl
|
|
hlslPatchCommon.hlsl
|
|
hlslPatchBSpline.hlsl
|
|
hlslPatchGregory.hlsl
|
|
)
|
|
list(APPEND PLATFORM_GPU_LIBRARIES
|
|
${DXSDK_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${DXSDK_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# OpenCL code & dependencies
|
|
set(OPENCL_PUBLIC_HEADERS
|
|
clEvaluator.h
|
|
clVertexBuffer.h
|
|
opencl.h
|
|
)
|
|
|
|
if ( OPENCL_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
clEvaluator.cpp
|
|
clVertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${OPENCL_PUBLIC_HEADERS})
|
|
list(APPEND KERNEL_FILES
|
|
clKernel.cl
|
|
)
|
|
list(APPEND PLATFORM_GPU_LIBRARIES
|
|
${OPENCL_LIBRARIES}
|
|
)
|
|
include_directories( "${OPENCL_INCLUDE_DIRS}" )
|
|
if ( OPENGL_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES clGLVertexBuffer.cpp)
|
|
list(APPEND PUBLIC_HEADER_FILES clGLVertexBuffer.h)
|
|
endif()
|
|
|
|
if ( DXSDK_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
clD3D11VertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES
|
|
clD3D11VertexBuffer.h
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${OPENCL_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
# CUDA code & dependencies
|
|
set(CUDA_PUBLIC_HEADERS
|
|
cudaEvaluator.h
|
|
cudaVertexBuffer.h
|
|
)
|
|
|
|
if( CUDA_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
cudaEvaluator.cpp
|
|
cudaVertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES ${CUDA_PUBLIC_HEADERS})
|
|
list(APPEND CUDA_KERNEL_FILES
|
|
osd/cudaKernel.cu
|
|
)
|
|
set (CUDA_KERNEL_FILES ${CUDA_KERNEL_FILES} PARENT_SCOPE)
|
|
if ( OPENGL_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
cudaGLVertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES
|
|
cudaGLVertexBuffer.h
|
|
)
|
|
endif()
|
|
|
|
if( DXSDK_FOUND )
|
|
list(APPEND GPU_SOURCE_FILES
|
|
cudaD3D11VertexBuffer.cpp
|
|
)
|
|
list(APPEND PUBLIC_HEADER_FILES
|
|
cudaD3D11VertexBuffer.h
|
|
)
|
|
endif()
|
|
|
|
if (UNIX)
|
|
list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC --gpu-architecture compute_11 )
|
|
endif()
|
|
endif()
|
|
|
|
list(APPEND DOXY_HEADER_FILES ${CUDA_PUBLIC_HEADERS})
|
|
|
|
#-------------------------------------------------------------------------------
|
|
|
|
_stringify("${KERNEL_FILES}" INC_FILES)
|
|
|
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
|
|
|
|
#-------------------------------------------------------------------------------
|
|
source_group("Kernels" FILES ${KERNEL_FILES})
|
|
|
|
source_group("Inc" FILES ${INC_FILES})
|
|
|
|
# Compile objs first for both the CPU and GPU libs -----
|
|
add_library(osd_cpu_obj
|
|
OBJECT
|
|
${CPU_SOURCE_FILES}
|
|
${PRIVATE_HEADER_FILES}
|
|
${PUBLIC_HEADER_FILES}
|
|
)
|
|
|
|
add_library(osd_gpu_obj
|
|
OBJECT
|
|
${GPU_SOURCE_FILES}
|
|
${PRIVATE_HEADER_FILES}
|
|
${PUBLIC_HEADER_FILES}
|
|
${INC_FILES}
|
|
)
|
|
|
|
_add_doxy_headers( "${DOXY_HEADER_FILES}" )
|
|
|
|
install(
|
|
FILES
|
|
${PUBLIC_HEADER_FILES}
|
|
DESTINATION
|
|
"${CMAKE_INCDIR_BASE}/osd"
|
|
PERMISSIONS
|
|
OWNER_READ
|
|
GROUP_READ
|
|
WORLD_READ )
|
|
|
|
|
|
if (ANDROID)
|
|
install(
|
|
FILES
|
|
Android.mk
|
|
DESTINATION
|
|
"${LIBRARY_OUTPUT_PATH_ROOT}"
|
|
PERMISSIONS
|
|
OWNER_READ
|
|
GROUP_READ
|
|
WORLD_READ )
|
|
endif()
|
|
|
|
#-------------------------------------------------------------------------------
|