Demos - improve for MacOS

RichardGe · RichardGe · commit 88cabe5abc80 · 2020-10-23T11:23:05.000+02:00
diff --git a/tutorials/00_context_creation/main.cpp b/tutorials/00_context_creation/main.cpp
@@ -35,7 +35,7 @@ int main()
 
 	// Create context using a single GPU 
 	// note that multiple GPUs can be enabled for example with RPR_CREATION_FLAGS_ENABLE_GPU0 | RPR_CREATION_FLAGS_ENABLE_GPU1
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/01_camera_setup/main.cpp b/tutorials/01_camera_setup/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/02_mesh/main.cpp b/tutorials/02_mesh/main.cpp
@@ -38,7 +38,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/03_instance/main.cpp b/tutorials/03_instance/main.cpp
@@ -38,7 +38,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/10_light_point/main.cpp b/tutorials/10_light_point/main.cpp
@@ -39,7 +39,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/11_light_mesh/main.cpp b/tutorials/11_light_mesh/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/12_light_environment/main.cpp b/tutorials/12_light_environment/main.cpp
@@ -39,7 +39,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/20_material_textured/main.cpp b/tutorials/20_material_textured/main.cpp
@@ -39,7 +39,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/21_material_layered/main.cpp b/tutorials/21_material_layered/main.cpp
@@ -40,7 +40,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/22_material_uber/main.cpp b/tutorials/22_material_uber/main.cpp
@@ -53,7 +53,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	UPDATE_CALLBACK_DATA dataCallback;
 
diff --git a/tutorials/23_material_uber_sss/main.cpp b/tutorials/23_material_uber_sss/main.cpp
@@ -39,7 +39,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/30_tiled_render/main.cpp b/tutorials/30_tiled_render/main.cpp
@@ -102,7 +102,7 @@ void rprextMultiTileRender(sFrameBufferMetadata& meta, rpr_scene scene, rpr_cont
 	printf("  Tiled offset:       %f,%f\n", -tilesXf / 2.0f + .5f, -tilesYf / 2.0f + .5f);
 
 	//allocate the frambuffer data
-	rpr_framebuffer_desc desc = { meta.mTileSizeX , meta.mTileSizeY };
+	rpr_framebuffer_desc desc = { (rpr_uint)meta.mTileSizeX , (rpr_uint)meta.mTileSizeY };
 	rpr_framebuffer_format fmt = { 4, RPR_COMPONENT_TYPE_FLOAT32 };
 
 	rpr_framebuffer frame_buffer = NULL; status = rprContextCreateFrameBuffer(context, fmt, &desc, &frame_buffer); CHECK(status);
@@ -203,7 +203,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/31_framebuffer_access/main.cpp b/tutorials/31_framebuffer_access/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/32_gl_interop/main.cpp b/tutorials/32_gl_interop/main.cpp
@@ -311,7 +311,12 @@ int main(int argc, char** argv)
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0 | RPR_CREATION_FLAGS_ENABLE_GL_INTEROP, NULL, NULL, &g_context));
+	status = rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags 
+		#ifndef USING_NORTHSTAR   // note that for Northstar, we don't need the GL_INTEROP flag
+		| RPR_CREATION_FLAGS_ENABLE_GL_INTEROP
+		#endif
+		, NULL, NULL, &g_context);
+	CHECK(status);
 
 	// Set active plugin.
 	CHECK( rprContextSetActivePlugin(g_context, plugins[0]) );
diff --git a/tutorials/33_aov/main.cpp b/tutorials/33_aov/main.cpp
@@ -38,7 +38,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/40_postprocess_bloom/main.cpp b/tutorials/40_postprocess_bloom/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/41_postprocess_gamma/main.cpp b/tutorials/41_postprocess_gamma/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/50_curve/main.cpp b/tutorials/50_curve/main.cpp
@@ -48,7 +48,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context) );
+	CHECK( rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context) );
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/51_volume/main.cpp b/tutorials/51_volume/main.cpp
@@ -43,7 +43,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	 status  = rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context);
+	 status  = rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context);
 
 	// Set active plugin.
 	CHECK(  rprContextSetActivePlugin(context, plugins[0]) );
diff --git a/tutorials/60_mesh_export/main.cpp b/tutorials/60_mesh_export/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/61_mesh_import/main.cpp b/tutorials/61_mesh_import/main.cpp
@@ -41,7 +41,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/62_matball_demo/main.cpp b/tutorials/62_matball_demo/main.cpp
@@ -42,7 +42,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/63_hybrid/main.cpp b/tutorials/63_hybrid/main.cpp
@@ -59,7 +59,7 @@ int main()
 	size_t pluginCount = sizeof(plugins) / sizeof(plugins[0]);
 
 	// Create context using a single GPU 
-	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, RPR_CREATION_FLAGS_ENABLE_GPU0, NULL, NULL, &context));
+	CHECK(rprCreateContext(RPR_API_VERSION, plugins, pluginCount, g_ContextCreationFlags, NULL, NULL, &context));
 
 	// Set active plugin.
 	CHECK(rprContextSetActivePlugin(context, plugins[0]));
diff --git a/tutorials/64_mesh_obj_demo/main.cpp b/tutorials/64_mesh_obj_demo/main.cpp
@@ -232,6 +232,11 @@ const ContextSettings parseContextSettings(const picojson::value& config)
 		settings.creationFlags |= RPR_CREATION_FLAGS_ENABLE_CPU;
 	}
 
+
+	#if defined(USING_NORTHSTAR) && defined(__APPLE__) 
+	settings.creationFlags |= RPR_CREATION_FLAGS_ENABLE_METAL; // by default always enable Metal for MacOS
+	#endif
+
 	return settings;
 }
 
diff --git a/tutorials/common/common.h b/tutorials/common/common.h
@@ -3,6 +3,15 @@
 #include <assert.h> 
 #include <iostream>
 
+// creation flags used by most of the Demo.
+// examples:
+// RPR_CREATION_FLAGS_ENABLE_GPU0 <- use the first GPU
+// RPR_CREATION_FLAGS_ENABLE_CPU <- use the first CPU only
+// RPR_CREATION_FLAGS_ENABLE_GPU0 | RPR_CREATION_FLAGS_ENABLE_CPU <- use the first CPU+GPU
+// RPR_CREATION_FLAGS_ENABLE_GPU0 | RPR_CREATION_FLAGS_ENABLE_GPU1 <-- use 2 GPU
+rpr_creation_flags g_ContextCreationFlags = RPR_CREATION_FLAGS_ENABLE_GPU0;
+
+
 // Tahoe plugin is in maintenance mode - no new features planned.
 #if 0
 #if defined(WIN32)
@@ -21,6 +30,7 @@
 #define RPR_PLUGIN_FILE_NAME "libNorthstar64.so"
 #elif defined(__APPLE__)
 #define RPR_PLUGIN_FILE_NAME "libNorthstar64.dylib"
+g_ContextCreationFlags |= RPR_CREATION_FLAGS_ENABLE_METAL; // by default always enable Metal for MacOS
 #endif
 #define USING_NORTHSTAR
 #endif
