Merge pull request #941 from davidgyu/dev_metal_ptex_fix

Fixed mtlPtexViewer build
PixarAnimationStudios · Jul 14, 2017 · 1037701 · 1037701
2 parents 56317a9 + 661fd1f
commit 1037701
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/examples/mtlPtexViewer/mtlPtexViewer.mm b/examples/mtlPtexViewer/mtlPtexViewer.mm
@@ -558,7 +558,7 @@ -(void)_rebuildTextures {
     PtexCache *cache = PtexCache::create(1, PTEX_CACHE_SIZE);
     PtexTexture *ptex = cache->get(path.UTF8String, ptexError);
 #else
-    PtexTexture *ptex = PtexTexture::open(path, ptexError, true);
+    PtexTexture *ptex = PtexTexture::open(path.UTF8String, ptexError, true);
 #endif
 
     if (ptex == NULL) {
@@ -901,7 +901,8 @@ -(void)_rebuildPipelines {
         };
         )";
 
-        shaderBuilder << shaderSource.GetHullShaderSource(type);
+        auto fvarType = Far::PatchDescriptor::REGULAR;
+        shaderBuilder << shaderSource.GetHullShaderSource(type, fvarType);
         shaderBuilder << MTLPtexMipmapTexture::GetShaderSource();
         shaderBuilder << _osdShaderSource.UTF8String;