Changeset 5589 for nanovis/trunk

Timestamp:

May 21, 2015, 3:38:59 AM (9 years ago)

Author:

ldelgass

Message:

sync with release branch

File:

• nanovis/trunk/Shader.h (modified) (2 diffs)

nanovis/trunk/Shader.h

@@ -328 +328 @@
     }
 
+    static CGprogram loadCgSourceProgram(CGcontext context,
+                                         const char *filename,
+                                         CGprofile profile,
+                                         const char *entryPoint);
+
     std::string _vpFile;
     std::string _fpFile;
@@ -343 +348 @@
     static CGprofile _defaultFragmentProfile;
     static CGcontext _cgContext;
-
-    static CGprogram
-    loadCgSourceProgram(CGcontext context, const char *filename, 
-                        CGprofile profile, const char *entryPoint);
 };