More GLTF related fixes

-Add suffix "64" to RprSupport/RadeonProRender libs -Add more functions into RPR lib
ray-cast · Jun 22, 2018 · 155abad · 155abad
1 parent b76befb
commit 155abad
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/Rpr/CMakeLists.txt b/Rpr/CMakeLists.txt
@@ -47,10 +47,10 @@ source_group("Utils" FILES ${UTILS_SOURCES})
 
 list(APPEND SOURCES ${WRAP_OBJECT_SOURCES} ${UTILS_SOURCES})
 
-add_library(RadeonProRender SHARED ${SOURCES})
-target_compile_definitions(RadeonProRender PRIVATE RPR_EXPORT_API)
-target_compile_features(RadeonProRender PRIVATE cxx_std_14)
-target_include_directories(RadeonProRender PUBLIC ${Baikal_SOURCE_DIR}/Rpr)
-target_link_libraries(RadeonProRender PUBLIC Baikal BaikalIO OpenGL::GL GLEW::GLEW)
+add_library(RadeonProRender64 SHARED ${SOURCES})
+target_compile_definitions(RadeonProRender64 PRIVATE RPR_EXPORT_API)
+target_compile_features(RadeonProRender64 PRIVATE cxx_std_14)
+target_include_directories(RadeonProRender64 PUBLIC ${Baikal_SOURCE_DIR}/Rpr)
+target_link_libraries(RadeonProRender64 PUBLIC Baikal BaikalIO OpenGL::GL GLEW::GLEW)
 
 
diff --git a/Rpr/RadeonProRender.cpp b/Rpr/RadeonProRender.cpp
@@ -2566,3 +2566,42 @@ rpr_int rprContextCreateHeteroVolume(rpr_context context, rpr_hetero_volume * ou
  UNSUPPORTED_FUNCTION
 }
 
+rpr_int rprImageSetGamma(rpr_image image, rpr_float type)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+rpr_int rprImageSetMipmapEnabled(rpr_image image, rpr_bool enabled)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+rpr_int rprImageSetFilter(rpr_image image, rpr_image_filter_type type)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+RPR_API_ENTRY rpr_int rprHeteroVolumeSetFilter(rpr_hetero_volume heteroVolume, rpr_hetero_volume_filter filter)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+RPR_API_ENTRY rpr_int rprHeteroVolumeSetEmission(rpr_hetero_volume heteroVolume, rpr_float r, rpr_float g, rpr_float b)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+RPR_API_ENTRY rpr_int rprHeteroVolumeSetAlbedo(rpr_hetero_volume heteroVolume, rpr_float r, rpr_float g, rpr_float b)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+RPR_API_ENTRY rpr_int rprHeteroVolumeGetInfo(rpr_hetero_volume heteroVol, rpr_hetero_volume_parameter heteroVol_info, size_t size, void * data, size_t * size_ret)
+{
+ UNSUPPORTED_FUNCTION
+}
+
+RPR_API_ENTRY rpr_int rprBufferGetInfo(rpr_buffer buffer, rpr_buffer_info buffer_info, size_t size, void * data, size_t * size_ret)
+{
+ UNSUPPORTED_FUNCTION
+}
diff --git a/RprSupport/CMakeLists.txt b/RprSupport/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(SOURCES RprSupport.cpp)
 
-add_library(RprSupport SHARED ${SOURCES})
-target_compile_definitions(RprSupport PRIVATE RPR_EXPORT_API)
-target_compile_features(RprSupport PRIVATE cxx_std_14)
-target_include_directories(RprSupport PUBLIC ${RprSupport_HEADER})
-target_link_libraries(RprSupport PUBLIC RadeonProRender)
+add_library(RprSupport64 SHARED ${SOURCES})
+target_compile_definitions(RprSupport64 PRIVATE RPR_EXPORT_API)
+target_compile_features(RprSupport64 PRIVATE cxx_std_14)
+target_include_directories(RprSupport64 PUBLIC ${RprSupport_HEADER})
+target_link_libraries(RprSupport64 PUBLIC RadeonProRender64)
 
 
diff --git a/RprTest/CMakeLists.txt b/RprTest/CMakeLists.txt
@@ -10,6 +10,6 @@ set(SOURCES
 add_executable(RprTest ${SOURCES})
 target_compile_features(RprTest PRIVATE cxx_std_14)
 target_include_directories(RprTest PRIVATE .)
-target_link_libraries(RprTest PRIVATE GTest RprSupport RadeonProRender)
+target_link_libraries(RprTest PRIVATE GTest RprSupport64 RadeonProRender64)
 set_target_properties(RprTest
  PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${Baikal_SOURCE_DIR}/RprTest)