cg.h   cg.h 
skipping to change at line 59 skipping to change at line 59
* *
*/ */
#ifndef _cg_h #ifndef _cg_h
#define _cg_h #define _cg_h
/*************************************************************************/ /*************************************************************************/
/*** CG Run-Time Library API ***/ /*** CG Run-Time Library API ***/
/*************************************************************************/ /*************************************************************************/
#define CG_VERSION_NUM 2100 #define CG_VERSION_NUM 2200
#ifdef _WIN32 #ifdef _WIN32
# ifndef APIENTRY /* From Win32's <windef.h> */ # ifndef APIENTRY /* From Win32's <windef.h> */
# define CG_APIENTRY_DEFINED # define CG_APIENTRY_DEFINED
# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLAND C__) || defined(__LCC__) # if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLAND C__) || defined(__LCC__)
# define APIENTRY __stdcall # define APIENTRY __stdcall
# else # else
# define APIENTRY # define APIENTRY
# endif # endif
# endif # endif
skipping to change at line 124 skipping to change at line 124
typedef struct _CGobj *CGobj; typedef struct _CGobj *CGobj;
typedef struct _CGbuffer *CGbuffer; typedef struct _CGbuffer *CGbuffer;
typedef struct _CGeffect *CGeffect; typedef struct _CGeffect *CGeffect;
typedef struct _CGtechnique *CGtechnique; typedef struct _CGtechnique *CGtechnique;
typedef struct _CGpass *CGpass; typedef struct _CGpass *CGpass;
typedef struct _CGstate *CGstate; typedef struct _CGstate *CGstate;
typedef struct _CGstateassignment *CGstateassignment; typedef struct _CGstateassignment *CGstateassignment;
typedef struct _CGannotation *CGannotation; typedef struct _CGannotation *CGannotation;
typedef void *CGhandle; typedef void *CGhandle;
//!!! PREPROCESS BEGIN /*!!! PREPROCESS BEGIN */
typedef enum typedef enum
{ {
CG_UNKNOWN_TYPE, CG_UNKNOWN_TYPE,
CG_STRUCT, CG_STRUCT,
CG_ARRAY, CG_ARRAY,
CG_TYPELESS_STRUCT, CG_TYPELESS_STRUCT,
CG_TYPE_START_ENUM = 1024, CG_TYPE_START_ENUM = 1024,
# define CG_DATATYPE_MACRO(name, compiler_name, enum_name, base_name, ncols , nrows, pc) \ #define CG_DATATYPE_MACRO(name, compiler_name, enum_name, base_name, ncols, nrows, pc) \
enum_name , enum_name ,
#include <Cg/cg_datatypes.h> #include <Cg/cg_datatypes.h>
#undef CG_DATATYPE_MACRO
# undef CG_DATATYPE_MACRO CG_TYPE_MAX
} CGtype; } CGtype;
typedef enum typedef enum
{ {
# define CG_BINDLOCATION_MACRO(name,enum_name,compiler_name,\ # define CG_BINDLOCATION_MACRO(name,enum_name,compiler_name,\
enum_int,addressable,param_type) \ enum_int,addressable,param_type) \
enum_name = enum_int, enum_name = enum_int,
#include <Cg/cg_bindlocations.h> #include <Cg/cg_bindlocations.h>
CG_UNDEFINED = 3256, CG_UNDEFINED = 3256
} CGresource; } CGresource;
typedef enum typedef enum
{ {
CG_PROFILE_START = 6144, CG_PROFILE_START = 6144,
CG_PROFILE_UNKNOWN, CG_PROFILE_UNKNOWN,
# define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt #define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,
,int_id,vertex_profile) \ int_id,vertex_profile) \
CG_PROFILE_##compiler_id_caps = int_id, CG_PROFILE_##compiler_id_caps = int_id,
#define CG_PROFILE_ALIAS(name, compiler_id, compiler_id_caps, compiler_opt,
int_id,vertex_profile) \
CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,int_id
,vertex_profile)
#include <Cg/cg_profiles.h> #include <Cg/cg_profiles.h>
CG_PROFILE_MAX = 7100, CG_PROFILE_MAX = 7100
} CGprofile; } CGprofile;
typedef enum typedef enum
{ {
# define CG_ERROR_MACRO(code, enum_name, message) \ #define CG_ERROR_MACRO(code, enum_name, message) \
enum_name = code, enum_name = code,
# include <Cg/cg_errors.h> #include <Cg/cg_errors.h>
CG_ERROR_MAX
} CGerror; } CGerror;
typedef enum typedef enum
{ {
# define CG_ENUM_MACRO(enum_name, enum_val) \ #define CG_ENUM_MACRO(enum_name, enum_val) \
enum_name = enum_val, enum_name = enum_val,
# include <Cg/cg_enums.h> #include <Cg/cg_enums.h>
CG_ENUM_MAX
} CGenum; } CGenum;
//!!! PREPROCESS END /*!!! PREPROCESS END */
typedef enum typedef enum
{ {
CG_PARAMETERCLASS_UNKNOWN = 0, CG_PARAMETERCLASS_UNKNOWN = 0,
CG_PARAMETERCLASS_SCALAR, CG_PARAMETERCLASS_SCALAR,
CG_PARAMETERCLASS_VECTOR, CG_PARAMETERCLASS_VECTOR,
CG_PARAMETERCLASS_MATRIX, CG_PARAMETERCLASS_MATRIX,
CG_PARAMETERCLASS_STRUCT, CG_PARAMETERCLASS_STRUCT,
CG_PARAMETERCLASS_ARRAY, CG_PARAMETERCLASS_ARRAY,
CG_PARAMETERCLASS_SAMPLER, CG_PARAMETERCLASS_SAMPLER,
CG_PARAMETERCLASS_OBJECT CG_PARAMETERCLASS_OBJECT,
CG_PARAMETERCLASS_MAX
} CGparameterclass; } CGparameterclass;
typedef enum typedef enum
{ {
CG_UNKNOWN_DOMAIN = 0, CG_UNKNOWN_DOMAIN = 0,
CG_FIRST_DOMAIN = 1, CG_FIRST_DOMAIN = 1,
CG_VERTEX_DOMAIN = 1, CG_VERTEX_DOMAIN = 1,
CG_FRAGMENT_DOMAIN, CG_FRAGMENT_DOMAIN,
CG_GEOMETRY_DOMAIN, CG_GEOMETRY_DOMAIN,
CG_NUMBER_OF_DOMAINS CG_NUMBER_OF_DOMAINS,
CG_DOMAIN_MAX
} CGdomain; } CGdomain;
typedef enum typedef enum
{ {
CG_MAP_READ = 0, CG_MAP_READ = 0,
CG_MAP_WRITE, CG_MAP_WRITE,
CG_MAP_READ_WRITE, CG_MAP_READ_WRITE,
CG_MAP_WRITE_DISCARD, CG_MAP_WRITE_DISCARD,
CG_MAP_WRITE_NO_OVERWRITE CG_MAP_WRITE_NO_OVERWRITE,
CG_MAP_MAX
} CGbufferaccess; } CGbufferaccess;
typedef enum typedef enum
{ {
CG_BUFFER_USAGE_STREAM_DRAW = 0, CG_BUFFER_USAGE_STREAM_DRAW = 0,
CG_BUFFER_USAGE_STREAM_READ, CG_BUFFER_USAGE_STREAM_READ,
CG_BUFFER_USAGE_STREAM_COPY, CG_BUFFER_USAGE_STREAM_COPY,
CG_BUFFER_USAGE_STATIC_DRAW, CG_BUFFER_USAGE_STATIC_DRAW,
CG_BUFFER_USAGE_STATIC_READ, CG_BUFFER_USAGE_STATIC_READ,
CG_BUFFER_USAGE_STATIC_COPY, CG_BUFFER_USAGE_STATIC_COPY,
CG_BUFFER_USAGE_DYNAMIC_DRAW, CG_BUFFER_USAGE_DYNAMIC_DRAW,
CG_BUFFER_USAGE_DYNAMIC_READ, CG_BUFFER_USAGE_DYNAMIC_READ,
CG_BUFFER_USAGE_DYNAMIC_COPY CG_BUFFER_USAGE_DYNAMIC_COPY,
CG_BUFFER_USAGE_MAX
} CGbufferusage; } CGbufferusage;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef CGbool (CGENTRY * CGstatecallback)(CGstateassignment); typedef CGbool (CGENTRY * CGstatecallback)(CGstateassignment);
typedef void (CGENTRY * CGerrorCallbackFunc)(void); typedef void (CGENTRY * CGerrorCallbackFunc)(void);
typedef void (CGENTRY * CGerrorHandlerFunc)(CGcontext ctx, CGerror err, voi d *data); typedef void (CGENTRY * CGerrorHandlerFunc)(CGcontext ctx, CGerror err, voi d *data);
typedef void (CGENTRY * CGIncludeCallbackFunc)(CGcontext ctx, const char *f ilename); typedef void (CGENTRY * CGIncludeCallbackFunc)(CGcontext ctx, const char *f ilename);
skipping to change at line 449 skipping to change at line 462
CG_API void CGENTRY cgSetMatrixParameterdc(CGparameter param, const double *matrix); CG_API void CGENTRY cgSetMatrixParameterdc(CGparameter param, const double *matrix);
CG_API void CGENTRY cgSetMatrixParameterfc(CGparameter param, const float * matrix); CG_API void CGENTRY cgSetMatrixParameterfc(CGparameter param, const float * matrix);
CG_API void CGENTRY cgGetMatrixParameterir(CGparameter param, int *matrix); CG_API void CGENTRY cgGetMatrixParameterir(CGparameter param, int *matrix);
CG_API void CGENTRY cgGetMatrixParameterdr(CGparameter param, double *matri x); CG_API void CGENTRY cgGetMatrixParameterdr(CGparameter param, double *matri x);
CG_API void CGENTRY cgGetMatrixParameterfr(CGparameter param, float *matrix ); CG_API void CGENTRY cgGetMatrixParameterfr(CGparameter param, float *matrix );
CG_API void CGENTRY cgGetMatrixParameteric(CGparameter param, int *matrix); CG_API void CGENTRY cgGetMatrixParameteric(CGparameter param, int *matrix);
CG_API void CGENTRY cgGetMatrixParameterdc(CGparameter param, double *matri x); CG_API void CGENTRY cgGetMatrixParameterdc(CGparameter param, double *matri x);
CG_API void CGENTRY cgGetMatrixParameterfc(CGparameter param, float *matrix ); CG_API void CGENTRY cgGetMatrixParameterfc(CGparameter param, float *matrix );
CG_API CGenum CGENTRY cgGetMatrixParameterOrder(CGparameter param);
CG_API CGparameter CGENTRY cgGetNamedSubParameter(CGparameter param, const char *name); CG_API CGparameter CGENTRY cgGetNamedSubParameter(CGparameter param, const char *name);
/*** Type Functions ***/ /*** Type Functions ***/
CG_API const char * CGENTRY cgGetTypeString(CGtype type); CG_API const char * CGENTRY cgGetTypeString(CGtype type);
CG_API CGtype CGENTRY cgGetType(const char *type_string); CG_API CGtype CGENTRY cgGetType(const char *type_string);
CG_API CGtype CGENTRY cgGetNamedUserType(CGhandle handle, const char *name) ; CG_API CGtype CGENTRY cgGetNamedUserType(CGhandle handle, const char *name) ;
CG_API int CGENTRY cgGetNumUserTypes(CGhandle handle); CG_API int CGENTRY cgGetNumUserTypes(CGhandle handle);
skipping to change at line 481 skipping to change at line 496
/*** Enum Functions ***/ /*** Enum Functions ***/
CG_API const char * CGENTRY cgGetEnumString(CGenum en); CG_API const char * CGENTRY cgGetEnumString(CGenum en);
CG_API CGenum CGENTRY cgGetEnum(const char *enum_string); CG_API CGenum CGENTRY cgGetEnum(const char *enum_string);
/*** Profile Functions ***/ /*** Profile Functions ***/
CG_API const char * CGENTRY cgGetProfileString(CGprofile profile); CG_API const char * CGENTRY cgGetProfileString(CGprofile profile);
CG_API CGprofile CGENTRY cgGetProfile(const char *profile_string); CG_API CGprofile CGENTRY cgGetProfile(const char *profile_string);
CG_API int CGENTRY cgGetNumSupportedProfiles(void);
CG_API CGprofile CGENTRY cgGetSupportedProfile(int index);
CG_API CGbool CGENTRY cgIsProfileSupported(CGprofile profile);
CG_API CGbool CGENTRY cgGetProfileProperty(CGprofile profile, CGenum query)
;
/*** ParameterClass Functions ***/
CG_API const char * CGENTRY cgGetParameterClassString(CGparameterclass pc);
CG_API CGparameterclass CGENTRY cgGetParameterClassEnum(const char * pStrin
g);
/*** Domain Functions ***/
CG_API const char * CGENTRY cgGetDomainString(CGdomain domain);
CG_API CGdomain CGENTRY cgGetDomain(const char *domain_string);
CG_API CGdomain CGENTRY cgGetProgramDomain(CGprogram program);
/*** Error Functions ***/ /*** Error Functions ***/
CG_API CGerror CGENTRY cgGetError(void); CG_API CGerror CGENTRY cgGetError(void);
CG_API CGerror CGENTRY cgGetFirstError(void); CG_API CGerror CGENTRY cgGetFirstError(void);
CG_API const char * CGENTRY cgGetErrorString(CGerror error); CG_API const char * CGENTRY cgGetErrorString(CGerror error);
CG_API const char * CGENTRY cgGetLastErrorString(CGerror *error); CG_API const char * CGENTRY cgGetLastErrorString(CGerror *error);
CG_API void CGENTRY cgSetErrorCallback(CGerrorCallbackFunc func); CG_API void CGENTRY cgSetErrorCallback(CGerrorCallbackFunc func);
CG_API CGerrorCallbackFunc CGENTRY cgGetErrorCallback(void); CG_API CGerrorCallbackFunc CGENTRY cgGetErrorCallback(void);
CG_API void CGENTRY cgSetErrorHandler(CGerrorHandlerFunc func, void *data); CG_API void CGENTRY cgSetErrorHandler(CGerrorHandlerFunc func, void *data);
skipping to change at line 566 skipping to change at line 596
CG_API CGparameter CGENTRY cgGetConnectedStateAssignmentParameter(CGstateas signment); CG_API CGparameter CGENTRY cgGetConnectedStateAssignmentParameter(CGstateas signment);
CG_API CGstate CGENTRY cgGetStateAssignmentState(CGstateassignment); CG_API CGstate CGENTRY cgGetStateAssignmentState(CGstateassignment);
CG_API CGstate CGENTRY cgGetSamplerStateAssignmentState(CGstateassignment); CG_API CGstate CGENTRY cgGetSamplerStateAssignmentState(CGstateassignment);
CG_API CGstate CGENTRY cgCreateState(CGcontext, const char *name, CGtype); CG_API CGstate CGENTRY cgCreateState(CGcontext, const char *name, CGtype);
CG_API CGstate CGENTRY cgCreateArrayState(CGcontext, const char *name, CGty pe, int nelems); CG_API CGstate CGENTRY cgCreateArrayState(CGcontext, const char *name, CGty pe, int nelems);
CG_API void CGENTRY cgSetStateCallbacks(CGstate, CGstatecallback set, CGsta tecallback reset, CG_API void CGENTRY cgSetStateCallbacks(CGstate, CGstatecallback set, CGsta tecallback reset,
CGstatecallback validate); CGstatecallback validate);
CG_API void CGENTRY cgSetStateLatestProfile(CGstate, CGprofile);
CG_API CGstatecallback CGENTRY cgGetStateSetCallback(CGstate); CG_API CGstatecallback CGENTRY cgGetStateSetCallback(CGstate);
CG_API CGstatecallback CGENTRY cgGetStateResetCallback(CGstate); CG_API CGstatecallback CGENTRY cgGetStateResetCallback(CGstate);
CG_API CGstatecallback CGENTRY cgGetStateValidateCallback(CGstate); CG_API CGstatecallback CGENTRY cgGetStateValidateCallback(CGstate);
CG_API CGprofile CGENTRY cgGetStateLatestProfile(CGstate);
CG_API CGcontext CGENTRY cgGetStateContext(CGstate); CG_API CGcontext CGENTRY cgGetStateContext(CGstate);
CG_API CGtype CGENTRY cgGetStateType(CGstate); CG_API CGtype CGENTRY cgGetStateType(CGstate);
CG_API const char * CGENTRY cgGetStateName(CGstate); CG_API const char * CGENTRY cgGetStateName(CGstate);
CG_API CGstate CGENTRY cgGetNamedState(CGcontext, const char *name); CG_API CGstate CGENTRY cgGetNamedState(CGcontext, const char *name);
CG_API CGstate CGENTRY cgGetFirstState(CGcontext); CG_API CGstate CGENTRY cgGetFirstState(CGcontext);
CG_API CGstate CGENTRY cgGetNextState(CGstate); CG_API CGstate CGENTRY cgGetNextState(CGstate);
CG_API CGbool CGENTRY cgIsState(CGstate); CG_API CGbool CGENTRY cgIsState(CGstate);
CG_API void CGENTRY cgAddStateEnumerant(CGstate, const char *name, int valu e); CG_API void CGENTRY cgAddStateEnumerant(CGstate, const char *name, int valu e);
CG_API CGstate CGENTRY cgCreateSamplerState(CGcontext, const char *name, CG type); CG_API CGstate CGENTRY cgCreateSamplerState(CGcontext, const char *name, CG type);
skipping to change at line 663 skipping to change at line 695
CG_API CGannotation CGENTRY cgCreatePassAnnotation(CGpass, const char *name , CGtype); CG_API CGannotation CGENTRY cgCreatePassAnnotation(CGpass, const char *name , CGtype);
CG_API CGannotation CGENTRY cgCreateParameterAnnotation(CGparameter, const char *name, CGtype); CG_API CGannotation CGENTRY cgCreateParameterAnnotation(CGparameter, const char *name, CGtype);
CG_API CGannotation CGENTRY cgCreateProgramAnnotation(CGprogram, const char *name, CGtype); CG_API CGannotation CGENTRY cgCreateProgramAnnotation(CGprogram, const char *name, CGtype);
CG_API CGannotation CGENTRY cgCreateEffectAnnotation(CGeffect, const char * name, CGtype); CG_API CGannotation CGENTRY cgCreateEffectAnnotation(CGeffect, const char * name, CGtype);
CG_API CGbool CGENTRY cgSetIntAnnotation(CGannotation, int value); CG_API CGbool CGENTRY cgSetIntAnnotation(CGannotation, int value);
CG_API CGbool CGENTRY cgSetFloatAnnotation(CGannotation, float value); CG_API CGbool CGENTRY cgSetFloatAnnotation(CGannotation, float value);
CG_API CGbool CGENTRY cgSetBoolAnnotation(CGannotation, CGbool value); CG_API CGbool CGENTRY cgSetBoolAnnotation(CGannotation, CGbool value);
CG_API CGbool CGENTRY cgSetStringAnnotation(CGannotation, const char *value ); CG_API CGbool CGENTRY cgSetStringAnnotation(CGannotation, const char *value );
CG_API int CGENTRY cgGetNumStateEnumerants(CGstate);
CG_API const char * CGENTRY cgGetStateEnumerant(CGstate, int index, int* va
lue);
CG_API const char * CGENTRY cgGetStateEnumerantName(CGstate, int value); CG_API const char * CGENTRY cgGetStateEnumerantName(CGstate, int value);
CG_API int CGENTRY cgGetStateEnumerantValue(CGstate, const char *name); CG_API int CGENTRY cgGetStateEnumerantValue(CGstate, const char *name);
CG_API CGeffect CGENTRY cgGetParameterEffect(CGparameter param); CG_API CGeffect CGENTRY cgGetParameterEffect(CGparameter param);
CG_API CGparameterclass CGENTRY cgGetTypeClass(CGtype type); CG_API CGparameterclass CGENTRY cgGetTypeClass(CGtype type);
CG_API CGtype CGENTRY cgGetTypeBase(CGtype type); CG_API CGtype CGENTRY cgGetTypeBase(CGtype type);
CG_API CGbool CGENTRY cgGetTypeSizes(CGtype type, int *nrows, int *ncols); CG_API CGbool CGENTRY cgGetTypeSizes(CGtype type, int *nrows, int *ncols);
CG_API void CGENTRY cgGetMatrixSize(CGtype type, int *nrows, int *ncols); CG_API void CGENTRY cgGetMatrixSize(CGtype type, int *nrows, int *ncols);
 End of changes. 21 change blocks. 
38 lines changed or deleted 77 lines changed or added


 cgGL.h   cgGL.h 
skipping to change at line 142 skipping to change at line 142
*** Profile Functions *** Profile Functions
************************************************************************** ***/ ************************************************************************** ***/
CGGL_API CGbool CGGLENTRY cgGLIsProfileSupported(CGprofile profile); CGGL_API CGbool CGGLENTRY cgGLIsProfileSupported(CGprofile profile);
CGGL_API void CGGLENTRY cgGLEnableProfile(CGprofile profile); CGGL_API void CGGLENTRY cgGLEnableProfile(CGprofile profile);
CGGL_API void CGGLENTRY cgGLDisableProfile(CGprofile profile); CGGL_API void CGGLENTRY cgGLDisableProfile(CGprofile profile);
CGGL_API CGprofile CGGLENTRY cgGLGetLatestProfile(CGGLenum profile_type); CGGL_API CGprofile CGGLENTRY cgGLGetLatestProfile(CGGLenum profile_type);
CGGL_API void CGGLENTRY cgGLSetOptimalOptions(CGprofile profile); CGGL_API void CGGLENTRY cgGLSetOptimalOptions(CGprofile profile);
CGGL_API char const ** CGGLENTRY cgGLGetOptimalOptions(CGprofile profile);
/************************************************************************** **** /************************************************************************** ****
*** Program Managment Functions *** Program Managment Functions
************************************************************************** ***/ ************************************************************************** ***/
CGGL_API void CGGLENTRY cgGLLoadProgram(CGprogram program); CGGL_API void CGGLENTRY cgGLLoadProgram(CGprogram program);
CGGL_API void CGGLENTRY cgGLUnloadProgram(CGprogram program); CGGL_API void CGGLENTRY cgGLUnloadProgram(CGprogram program);
CGGL_API CGbool CGGLENTRY cgGLIsProgramLoaded(CGprogram program); CGGL_API CGbool CGGLENTRY cgGLIsProgramLoaded(CGprogram program);
CGGL_API void CGGLENTRY cgGLBindProgram(CGprogram program); CGGL_API void CGGLENTRY cgGLBindProgram(CGprogram program);
CGGL_API void CGGLENTRY cgGLUnbindProgram(CGprofile profile); CGGL_API void CGGLENTRY cgGLUnbindProgram(CGprofile profile);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 cgGL_profiles.h   cgGL_profiles.h 
skipping to change at line 62 skipping to change at line 62
CG_PROFILE_MACRO(Vertex,vp20,VP20,"vp20",6146,1) CG_PROFILE_MACRO(Vertex,vp20,VP20,"vp20",6146,1)
CG_PROFILE_MACRO(Fragment20,fp20,FP20,"fp20",6147,0) CG_PROFILE_MACRO(Fragment20,fp20,FP20,"fp20",6147,0)
CG_PROFILE_MACRO(Vertex30,vp30,VP30,"vp30",6148,1) CG_PROFILE_MACRO(Vertex30,vp30,VP30,"vp30",6148,1)
CG_PROFILE_MACRO(Fragment,fp30,FP30,"fp30",6149,0) CG_PROFILE_MACRO(Fragment,fp30,FP30,"fp30",6149,0)
CG_PROFILE_MACRO(ARBVertex,arbvp1,ARBVP1,"arbvp1",6150,1) CG_PROFILE_MACRO(ARBVertex,arbvp1,ARBVP1,"arbvp1",6150,1)
CG_PROFILE_MACRO(Fragment40,fp40,FP40,"fp40",6151,0) CG_PROFILE_MACRO(Fragment40,fp40,FP40,"fp40",6151,0)
CG_PROFILE_MACRO(ARBFragment,arbfp1,ARBFP1,"arbfp1",7000,0) CG_PROFILE_MACRO(ARBFragment,arbfp1,ARBFP1,"arbfp1",7000,0)
CG_PROFILE_MACRO(Vertex40,vp40,VP40,"vp40",7001,1) CG_PROFILE_MACRO(Vertex40,vp40,VP40,"vp40",7001,1)
CG_PROFILE_MACRO(GLSLVertex,glslv,GLSLV,"glslv",7007,1) CG_PROFILE_MACRO(GLSLVertex,glslv,GLSLV,"glslv",7007,1)
CG_PROFILE_MACRO(GLSLFragment,glslf,GLSLF,"glslf",7008,0) CG_PROFILE_MACRO(GLSLFragment,glslf,GLSLF,"glslf",7008,0)
CG_PROFILE_MACRO(GLSLGeometry,glslg,GLSLG,"glslg",7016,0)
CG_PROFILE_MACRO(GLSLCombined, glslc, GLSLC, "glslc", 7009, 0) CG_PROFILE_MACRO(GLSLCombined, glslc, GLSLC, "glslc", 7009, 0)
CG_PROFILE_MACRO(GPUFragment,gpu_fp,GPU_FP,"gp4fp",7010,0) CG_PROFILE_MACRO(GPUFragment,gpu_fp,GPU_FP,"gp4fp",7010,0)
CG_PROFILE_MACRO(GPUVertex,gpu_vp,GPU_VP,"gp4vp",7011,1) CG_PROFILE_MACRO(GPUVertex,gpu_vp,GPU_VP,"gp4vp",7011,1)
CG_PROFILE_MACRO(GPUGeometry,gpu_gp,GPU_GP,"gp4gp",7012,0) CG_PROFILE_MACRO(GPUGeometry,gpu_gp,GPU_GP,"gp4gp",7012,0)
CG_PROFILE_ALIAS(GPUFragment,gp4fp,GP4FP,"gp4fp",7010,0)
CG_PROFILE_ALIAS(GPUVertex,gp4vp,GP4VP,"gp4vp",7011,1)
CG_PROFILE_ALIAS(GPUGeometry,gp4gp,GP4GP,"gp4gp",7012,0)
#ifndef CG_IN_PROFILES_INCLUDE #ifndef CG_IN_PROFILES_INCLUDE
# undef CG_PROFILE_MACRO # undef CG_PROFILE_MACRO
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 cg_enums.h   cg_enums.h 
skipping to change at line 107 skipping to change at line 107
CG_ENUM_MACRO(CG_TRIANGLE_ADJ, 4128) CG_ENUM_MACRO(CG_TRIANGLE_ADJ, 4128)
CG_ENUM_MACRO(CG_POINT_OUT, 4129) CG_ENUM_MACRO(CG_POINT_OUT, 4129)
CG_ENUM_MACRO(CG_LINE_OUT, 4130) CG_ENUM_MACRO(CG_LINE_OUT, 4130)
CG_ENUM_MACRO(CG_TRIANGLE_OUT, 4131) CG_ENUM_MACRO(CG_TRIANGLE_OUT, 4131)
CG_ENUM_MACRO(CG_IMMEDIATE_PARAMETER_SETTING, 4132) CG_ENUM_MACRO(CG_IMMEDIATE_PARAMETER_SETTING, 4132)
CG_ENUM_MACRO(CG_DEFERRED_PARAMETER_SETTING, 4133) CG_ENUM_MACRO(CG_DEFERRED_PARAMETER_SETTING, 4133)
CG_ENUM_MACRO(CG_NO_LOCKS_POLICY, 4134) CG_ENUM_MACRO(CG_NO_LOCKS_POLICY, 4134)
CG_ENUM_MACRO(CG_THREAD_SAFE_POLICY, 4135) CG_ENUM_MACRO(CG_THREAD_SAFE_POLICY, 4135)
CG_ENUM_MACRO(CG_FORCE_UPPER_CASE_POLICY, 4136) CG_ENUM_MACRO(CG_FORCE_UPPER_CASE_POLICY, 4136)
CG_ENUM_MACRO(CG_UNCHANGED_CASE_POLICY, 4137) CG_ENUM_MACRO(CG_UNCHANGED_CASE_POLICY, 4137)
CG_ENUM_MACRO(CG_IS_OPENGL_PROFILE, 4138)
CG_ENUM_MACRO(CG_IS_DIRECT3D_PROFILE, 4139)
CG_ENUM_MACRO(CG_IS_DIRECT3D_8_PROFILE, 4140)
CG_ENUM_MACRO(CG_IS_DIRECT3D_9_PROFILE, 4141)
CG_ENUM_MACRO(CG_IS_DIRECT3D_10_PROFILE, 4142)
CG_ENUM_MACRO(CG_IS_VERTEX_PROFILE, 4143)
CG_ENUM_MACRO(CG_IS_FRAGMENT_PROFILE, 4144)
CG_ENUM_MACRO(CG_IS_GEOMETRY_PROFILE, 4145)
CG_ENUM_MACRO(CG_IS_TRANSLATION_PROFILE, 4146)
CG_ENUM_MACRO(CG_IS_HLSL_PROFILE, 4147)
CG_ENUM_MACRO(CG_IS_GLSL_PROFILE, 4148)
/*
if you add any enums here, you must also change
the last enum value in the definition of cgiEnumStringMap
(currently found in common/cg_enum.cpp)
*/
#undef CG_ENUM_MACRO #undef CG_ENUM_MACRO
 End of changes. 1 change blocks. 
0 lines changed or deleted 18 lines changed or added


 cg_errors.h   cg_errors.h 
skipping to change at line 256 skipping to change at line 256
"Invalid pass handle.") "Invalid pass handle.")
CG_ERROR_MACRO(44, CG_ERROR_MACRO(44,
CG_INVALID_ANNOTATION_HANDLE_ERROR, CG_INVALID_ANNOTATION_HANDLE_ERROR,
"Invalid annotation handle.") "Invalid annotation handle.")
CG_ERROR_MACRO(45, CG_ERROR_MACRO(45,
CG_INVALID_TECHNIQUE_HANDLE_ERROR, CG_INVALID_TECHNIQUE_HANDLE_ERROR,
"Invalid technique handle.") "Invalid technique handle.")
// Do not use this! Use CG_INVALID_PARAM_HANDLE_ERROR instead. /* Do not use this! Use CG_INVALID_PARAM_HANDLE_ERROR instead. */
CG_ERROR_MACRO(46, CG_ERROR_MACRO(46,
CG_INVALID_PARAMETER_HANDLE_ERROR, CG_INVALID_PARAMETER_HANDLE_ERROR,
"Invalid parameter handle.") "Invalid parameter handle.")
CG_ERROR_MACRO(47, CG_ERROR_MACRO(47,
CG_STATE_ASSIGNMENT_TYPE_MISMATCH_ERROR, CG_STATE_ASSIGNMENT_TYPE_MISMATCH_ERROR,
"Operation is not valid for this type of stateassignment.") "Operation is not valid for this type of stateassignment.")
CG_ERROR_MACRO(48, CG_ERROR_MACRO(48,
CG_INVALID_FUNCTION_HANDLE_ERROR, CG_INVALID_FUNCTION_HANDLE_ERROR,
skipping to change at line 317 skipping to change at line 318
"Buffer index is out of bounds.") "Buffer index is out of bounds.")
CG_ERROR_MACRO(59, CG_ERROR_MACRO(59,
CG_BUFFER_ALREADY_MAPPED_ERROR, CG_BUFFER_ALREADY_MAPPED_ERROR,
"The buffer is already mapped.") "The buffer is already mapped.")
CG_ERROR_MACRO(60, CG_ERROR_MACRO(60,
CG_BUFFER_UPDATE_NOT_ALLOWED_ERROR, CG_BUFFER_UPDATE_NOT_ALLOWED_ERROR,
"The buffer cannot be updated.") "The buffer cannot be updated.")
CG_ERROR_MACRO(61,
CG_GLSLG_UNCOMBINED_LOAD_ERROR,
"The GLSL geometry program can not load without being combin
ed with a vertex program.")
#undef CG_ERROR_MACRO #undef CG_ERROR_MACRO
 End of changes. 2 change blocks. 
1 lines changed or deleted 7 lines changed or added


 cg_profiles.h   cg_profiles.h 
skipping to change at line 57 skipping to change at line 57
* NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF NVIDIA HAS BEEN ADVI SED * NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF NVIDIA HAS BEEN ADVI SED
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
/* /*
* The following macro invocations define the supported CG profiles. * The following macro invocations define the supported CG profiles.
* *
* The macros have the form : * The macros have the form :
* *
* CG_PROFILE_MACRO(name, compiler_id, compiler_opt) * CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt, in t_id, vertex_profile)
* *
* name : The name of the profile. Used consistently with the API. * name : The name of the profile. Used consistently with the API.
* compiler_id : The identifier string for the profile used by the com piler. * compiler_id : The identifier string for the profile used by the com piler.
* compiler_id_caps : compiler_id in caps. * compiler_id_caps : compiler_id in caps.
* compiler_opt : The command-line switch used to force compilation int o * compiler_opt : The command-line switch used to force compilation int o
* the profile. * the profile.
* int_id : Integer enumerant associated with this bind locat ion. * int_id : Integer enumerant associated with this bind locat ion.
* vertex_profile : Non-zero if this is a vertex profile, otherwise i t * vertex_profile : Non-zero if this is a vertex profile, otherwise i t
* is considered to be a fragment profile. * is considered to be a fragment profile.
* *
* *
*/ */
#define CG_IN_PROFILES_INCLUDE #define CG_IN_PROFILES_INCLUDE
/* Used for profile enumeration aliases */
#ifndef CG_PROFILE_ALIAS
#define CG_PROFILE_ALIAS(name, compiler_id, compiler_id_caps, compiler_opt,
int_id, vertex_profile) /*nothing*/
#endif
#include <Cg/cgGL_profiles.h> #include <Cg/cgGL_profiles.h>
CG_PROFILE_MACRO(DX9Vertex11,vs_1_1,VS_1_1,"vs_1_1",6153,1) CG_PROFILE_MACRO(DX9Vertex11,vs_1_1,VS_1_1,"vs_1_1",6153,1)
CG_PROFILE_MACRO(DX9Vertex20,vs_2_0,VS_2_0,"vs_2_0",6154,1) CG_PROFILE_MACRO(DX9Vertex20,vs_2_0,VS_2_0,"vs_2_0",6154,1)
CG_PROFILE_MACRO(DX9Vertex2x,vs_2_x,VS_2_X,"vs_2_x",6155,1) CG_PROFILE_MACRO(DX9Vertex2x,vs_2_x,VS_2_X,"vs_2_x",6155,1)
CG_PROFILE_MACRO(DX9Vertex2sw,vs_2_sw,VS_2_SW,"vs_2_sw",6156,1) CG_PROFILE_MACRO(DX9Vertex2sw,vs_2_sw,VS_2_SW,"vs_2_sw",6156,1)
CG_PROFILE_MACRO(DX9Vertex30,vs_3_0,VS_3_0,"vs_3_0",6157,1) CG_PROFILE_MACRO(DX9Vertex30,vs_3_0,VS_3_0,"vs_3_0",6157,1)
CG_PROFILE_MACRO(DX9VertexHLSL,hlslv, HLSLV,"hlslv",6158,1) CG_PROFILE_MACRO(DX9VertexHLSL,hlslv, HLSLV,"hlslv",6158,1)
CG_PROFILE_MACRO(DX9Pixel11,ps_1_1,PS_1_1,"ps_1_1",6159,0) CG_PROFILE_MACRO(DX9Pixel11,ps_1_1,PS_1_1,"ps_1_1",6159,0)
CG_PROFILE_MACRO(DX9Pixel12,ps_1_2,PS_1_2,"ps_1_2",6160,0) CG_PROFILE_MACRO(DX9Pixel12,ps_1_2,PS_1_2,"ps_1_2",6160,0)
CG_PROFILE_MACRO(DX9Pixel13,ps_1_3,PS_1_3,"ps_1_3",6161,0) CG_PROFILE_MACRO(DX9Pixel13,ps_1_3,PS_1_3,"ps_1_3",6161,0)
CG_PROFILE_MACRO(DX9Pixel20,ps_2_0,PS_2_0,"ps_2_0",6162,0) CG_PROFILE_MACRO(DX9Pixel20,ps_2_0,PS_2_0,"ps_2_0",6162,0)
CG_PROFILE_MACRO(DX9Pixel2x,ps_2_x,PS_2_X,"ps_2_x",6163,0) CG_PROFILE_MACRO(DX9Pixel2x,ps_2_x,PS_2_X,"ps_2_x",6163,0)
CG_PROFILE_MACRO(DX9Pixel2sw,ps_2_sw,PS_2_SW,"ps_2_sw",6164,0) CG_PROFILE_MACRO(DX9Pixel2sw,ps_2_sw,PS_2_SW,"ps_2_sw",6164,0)
CG_PROFILE_MACRO(DX9Pixel30,ps_3_0,PS_3_0,"ps_3_0",6165,0) CG_PROFILE_MACRO(DX9Pixel30,ps_3_0,PS_3_0,"ps_3_0",6165,0)
CG_PROFILE_MACRO(DX9PixelHLSL,hlslf,HLSLF,"hlslf",6166,0) CG_PROFILE_MACRO(DX9PixelHLSL,hlslf,HLSLF,"hlslf",6166,0)
CG_PROFILE_MACRO(DX10Vertex40,vs_4_0,VS_4_0,"vs_4_0",6167,1) CG_PROFILE_MACRO(DX10Vertex40,vs_4_0,VS_4_0,"vs_4_0",6167,1)
CG_PROFILE_MACRO(DX10Pixel40,ps_4_0,PS_4_0,"ps_4_0",6168,0) CG_PROFILE_MACRO(DX10Pixel40,ps_4_0,PS_4_0,"ps_4_0",6168,0)
CG_PROFILE_MACRO(DX10Geometry40,gs_4_0,GS_4_0,"gs_4_0",6169,0)
CG_PROFILE_MACRO(Generic, generic, GENERIC, "generic", 7002,0) CG_PROFILE_MACRO(Generic, generic, GENERIC, "generic", 7002,0)
#undef CG_PROFILE_MACRO #undef CG_PROFILE_MACRO
#undef CG_PROFILE_ALIAS
#undef CG_IN_PROFILES_INCLUDE #undef CG_IN_PROFILES_INCLUDE
 End of changes. 4 change blocks. 
1 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/