Changeset 5589


Ignore:
Timestamp:
May 21, 2015, 6:38:59 AM (4 years ago)
Author:
ldelgass
Message:

sync with release branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Shader.h

    r4895 r5589  
    328328    }
    329329
     330    static CGprogram loadCgSourceProgram(CGcontext context,
     331                                         const char *filename,
     332                                         CGprofile profile,
     333                                         const char *entryPoint);
     334
    330335    std::string _vpFile;
    331336    std::string _fpFile;
     
    343348    static CGprofile _defaultFragmentProfile;
    344349    static CGcontext _cgContext;
    345 
    346     static CGprogram
    347     loadCgSourceProgram(CGcontext context, const char *filename,
    348                         CGprofile profile, const char *entryPoint);
    349350};
    350351
Note: See TracChangeset for help on using the changeset viewer.