cg: headers diff between 1.1 and 1.2.1 versions

	cg.h	cg.h

	skipping to change at line 55	skipping to change at line 55
	* REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE,	* REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE,
	* HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING	* HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING
	* 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.
	*	*
	*/	*/

	#ifndef _cg_h	#ifndef _cg_h
	#define _cg_h	#define _cg_h


	#ifndef CG_DEPRECATED_API	#define CG_VERSION_1_2 1
		#define CG_VERSION_NUM 1200

		//
		// This #define foreces the old API for now. This will be removed soon, bu
		t
		// the user will still have the ability to enable it.
		//
		// #define CG_DEPRECATED_1_1_API 1

	// Set up for either Win32 import/export/lib.	// Set up for either Win32 import/export/lib.
	#ifndef CGDLL_API	#ifndef CGDLL_API
	#ifdef WIN32	#ifdef WIN32
	#ifdef CGDLL_EXPORTS	#ifdef CGDLL_EXPORTS
	#define CGDLL_API __declspec(dllexport)	#define CGDLL_API __declspec(dllexport)
	#elif defined (CG_LIB)	#elif defined (CG_LIB)
	#define CGDLL_API	#define CGDLL_API
	#else	#else
	#define CGDLL_API __declspec(dllimport)	#define CGDLL_API __declspec(dllimport)

	skipping to change at line 89	skipping to change at line 96

	typedef int CGbool;	typedef int CGbool;

	#define CG_FALSE ((CGbool)0)	#define CG_FALSE ((CGbool)0)
	#define CG_TRUE ((CGbool)1)	#define CG_TRUE ((CGbool)1)

	typedef struct _CGcontext *CGcontext;	typedef struct _CGcontext *CGcontext;
	typedef struct _CGprogram *CGprogram;	typedef struct _CGprogram *CGprogram;
	typedef struct _CGparameter *CGparameter;	typedef struct _CGparameter *CGparameter;


		//!!! PREPROCESS BEGIN

	typedef enum	typedef enum
	{	{
	CG_UNKNOWN_TYPE,	CG_UNKNOWN_TYPE,
	CG_STRUCT,	CG_STRUCT,
	CG_ARRAY,	CG_ARRAY,

	CG_TYPE_START_ENUM = 1024,	CG_TYPE_START_ENUM = 1024,
	# define CG_DATATYPE_MACRO(name, compiler_name, enum_name, ncols, nrows) \	# define CG_DATATYPE_MACRO(name, compiler_name, enum_name, ncols, nrows) \
	enum_name ,	enum_name ,


	skipping to change at line 130	skipping to change at line 139
	# define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt ,int_id,vertex_profile) \	# define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt ,int_id,vertex_profile) \
	CG_PROFILE_##compiler_id_caps = int_id,	CG_PROFILE_##compiler_id_caps = int_id,

	#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, new_enum_name, message) \	# define CG_ERROR_MACRO(code, enum_name, message) \
	new_enum_name = code,	enum_name = code,
	# include <Cg/cg_errors.h>	# include <Cg/cg_errors.h>
	} CGerror;	} CGerror;


		//!!! PREPROCESS END

	typedef enum	typedef enum
	{	{

	CG_UNKNOWN = 4096,	# define CG_ENUM_MACRO(enum_name, enum_val) \
	CG_IN,	enum_name = enum_val,
	CG_OUT,	# include <Cg/cg_enums.h>
	CG_INOUT,
	CG_MIXED,
	CG_VARYING,
	CG_UNIFORM,
	CG_CONSTANT,
	CG_PROGRAM_SOURCE,
	CG_PROGRAM_ENTRY,
	CG_COMPILED_PROGRAM,
	CG_PROGRAM_PROFILE,

	CG_GLOBAL,
	CG_PROGRAM,

	CG_DEFAULT,
	CG_ERROR,

	CG_SOURCE,
	CG_OBJECT,

	} CGenum;	} CGenum;

	#include <stdarg.h>	#include <stdarg.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	typedef void (*CGerrorCallbackFunc)(void);	typedef void (*CGerrorCallbackFunc)(void);

	/*************************************************************************/	/*************************************************************************/
	/* Functions */	/* Functions */
	/*************************************************************************/	/*************************************************************************/


		#ifndef CG_EXPLICIT

	/* Context functions */	/* Context functions */

	CGDLL_API CGcontext cgCreateContext(void);	CGDLL_API CGcontext cgCreateContext(void);
	CGDLL_API void cgDestroyContext(CGcontext ctx);	CGDLL_API void cgDestroyContext(CGcontext ctx);
	CGDLL_API CGbool cgIsContext(CGcontext ctx);	CGDLL_API CGbool cgIsContext(CGcontext ctx);
	CGDLL_API const char *cgGetLastListing(CGcontext ctx);	CGDLL_API const char *cgGetLastListing(CGcontext ctx);

		CGDLL_API void cgSetAutoCompile(CGcontext ctx, CGenum flag);

	/* Program functions */	/* Program functions */
	CGDLL_API CGprogram cgCreateProgram(CGcontext ctx,	CGDLL_API CGprogram cgCreateProgram(CGcontext ctx,
	CGenum program_type,	CGenum program_type,
	const char *program,	const char *program,
	CGprofile profile,	CGprofile profile,
	const char *entry,	const char *entry,
	const char **args);	const char **args);
	CGDLL_API CGprogram cgCreateProgramFromFile(CGcontext ctx,	CGDLL_API CGprogram cgCreateProgramFromFile(CGcontext ctx,
	CGenum program_type,	CGenum program_type,

	skipping to change at line 207	skipping to change at line 202
	CGDLL_API CGprogram cgGetNextProgram(CGprogram current);	CGDLL_API CGprogram cgGetNextProgram(CGprogram current);
	CGDLL_API CGcontext cgGetProgramContext(CGprogram prog);	CGDLL_API CGcontext cgGetProgramContext(CGprogram prog);
	CGDLL_API CGbool cgIsProgram(CGprogram program);	CGDLL_API CGbool cgIsProgram(CGprogram program);

	CGDLL_API void cgCompileProgram(CGprogram program);	CGDLL_API void cgCompileProgram(CGprogram program);
	CGDLL_API CGbool cgIsProgramCompiled(CGprogram program);	CGDLL_API CGbool cgIsProgramCompiled(CGprogram program);
	CGDLL_API const char *cgGetProgramString(CGprogram prog, CGenum pname);	CGDLL_API const char *cgGetProgramString(CGprogram prog, CGenum pname);
	CGDLL_API CGprofile cgGetProgramProfile(CGprogram prog);	CGDLL_API CGprofile cgGetProgramProfile(CGprogram prog);

	/* Parameter functions */	/* Parameter functions */


		CGDLL_API CGparameter cgCreateParameter(CGcontext ctx, CGtype type);
		CGDLL_API CGparameter cgCreateParameterArray(CGcontext ctx,
		CGtype type,
		int length);
		CGDLL_API CGparameter cgCreateParameterMultiDimArray(CGcontext ctx,
		CGtype type,
		int dim,
		const int *lengths);
		CGDLL_API void cgDestroyParameter(CGparameter param);
		CGDLL_API void cgConnectParameter(CGparameter from, CGparameter to);
		CGDLL_API void cgDisconnectParameter(CGparameter param);
		CGDLL_API CGparameter cgGetConnectedParameter(CGparameter param);

		CGDLL_API int cgGetNumConnectedToParameters(CGparameter param);
		CGDLL_API CGparameter cgGetConnectedToParameter(CGparameter param, int inde
		x);

	CGDLL_API CGparameter cgGetNamedParameter(CGprogram prog, const char *name) ;	CGDLL_API CGparameter cgGetNamedParameter(CGprogram prog, const char *name) ;

		CGDLL_API CGparameter cgGetNamedProgramParameter(CGprogram prog,
		CGenum name_space,
		const char *name);

	CGDLL_API CGparameter cgGetFirstParameter(CGprogram prog, CGenum name_space );	CGDLL_API CGparameter cgGetFirstParameter(CGprogram prog, CGenum name_space );
	CGDLL_API CGparameter cgGetNextParameter(CGparameter current);	CGDLL_API CGparameter cgGetNextParameter(CGparameter current);
	CGDLL_API CGparameter cgGetFirstLeafParameter(CGprogram prog, CGenum name_s pace);	CGDLL_API CGparameter cgGetFirstLeafParameter(CGprogram prog, CGenum name_s pace);
	CGDLL_API CGparameter cgGetNextLeafParameter(CGparameter current);	CGDLL_API CGparameter cgGetNextLeafParameter(CGparameter current);

	CGDLL_API CGparameter cgGetFirstStructParameter(CGparameter param);	CGDLL_API CGparameter cgGetFirstStructParameter(CGparameter param);

		CGDLL_API CGparameter cgGetNamedStructParameter(CGparameter param,
		const char *name);

	CGDLL_API CGparameter cgGetFirstDependentParameter(CGparameter param);	CGDLL_API CGparameter cgGetFirstDependentParameter(CGparameter param);

	CGDLL_API CGparameter cgGetArrayParameter(CGparameter aparam, int index);	CGDLL_API CGparameter cgGetArrayParameter(CGparameter aparam, int index);
	CGDLL_API int cgGetArrayDimension(CGparameter param);	CGDLL_API int cgGetArrayDimension(CGparameter param);

		CGDLL_API CGtype cgGetArrayType(CGparameter param);
	CGDLL_API int cgGetArraySize(CGparameter param, int dimension);	CGDLL_API int cgGetArraySize(CGparameter param, int dimension);

		CGDLL_API void cgSetArraySize(CGparameter param, int size);
		CGDLL_API void cgSetMultiDimArraySize(CGparameter param, const int *sizes);


	CGDLL_API CGprogram cgGetParameterProgram(CGparameter prog);	CGDLL_API CGprogram cgGetParameterProgram(CGparameter param);
		CGDLL_API CGcontext cgGetParameterContext(CGparameter param);
	CGDLL_API CGbool cgIsParameter(CGparameter param);	CGDLL_API CGbool cgIsParameter(CGparameter param);
	CGDLL_API const char *cgGetParameterName(CGparameter param);	CGDLL_API const char *cgGetParameterName(CGparameter param);
	CGDLL_API CGtype cgGetParameterType(CGparameter param);	CGDLL_API CGtype cgGetParameterType(CGparameter param);

		CGDLL_API CGtype cgGetParameterNamedType(CGparameter param);
	CGDLL_API const char *cgGetParameterSemantic(CGparameter param);	CGDLL_API const char *cgGetParameterSemantic(CGparameter param);
	CGDLL_API CGresource cgGetParameterResource(CGparameter param);	CGDLL_API CGresource cgGetParameterResource(CGparameter param);
	CGDLL_API CGresource cgGetParameterBaseResource(CGparameter param);	CGDLL_API CGresource cgGetParameterBaseResource(CGparameter param);
	CGDLL_API unsigned long cgGetParameterResourceIndex(CGparameter param);	CGDLL_API unsigned long cgGetParameterResourceIndex(CGparameter param);
	CGDLL_API CGenum cgGetParameterVariability(CGparameter param);	CGDLL_API CGenum cgGetParameterVariability(CGparameter param);
	CGDLL_API CGenum cgGetParameterDirection(CGparameter param);	CGDLL_API CGenum cgGetParameterDirection(CGparameter param);
	CGDLL_API CGbool cgIsParameterReferenced(CGparameter param);	CGDLL_API CGbool cgIsParameterReferenced(CGparameter param);
	CGDLL_API const double *cgGetParameterValues(CGparameter param,	CGDLL_API const double *cgGetParameterValues(CGparameter param,
	CGenum value_type,	CGenum value_type,
	int *nvalues);	int *nvalues);
	CGDLL_API int cgGetParameterOrdinalNumber(CGparameter param);	CGDLL_API int cgGetParameterOrdinalNumber(CGparameter param);

		CGDLL_API CGbool cgIsParameterGlobal(CGparameter param);
		CGDLL_API int cgGetParameterIndex(CGparameter param);

		CGDLL_API void cgSetParameterVariability(CGparameter param, CGenum vary);
		CGDLL_API void cgSetParameterSemantic(CGparameter param, const char *semant
		ic);

		CGDLL_API void cgSetParameter1f(CGparameter param, float x);
		CGDLL_API void cgSetParameter2f(CGparameter param, float x, float y);
		CGDLL_API void cgSetParameter3f(CGparameter param, float x, float y, float
		z);
		CGDLL_API void cgSetParameter4f(CGparameter param,
		float x,
		float y,
		float z,
		float w);
		CGDLL_API void cgSetParameter1d(CGparameter param, double x);
		CGDLL_API void cgSetParameter2d(CGparameter param, double x, double y);
		CGDLL_API void cgSetParameter3d(CGparameter param,
		double x,
		double y,
		double z);
		CGDLL_API void cgSetParameter4d(CGparameter param,
		double x,
		double y,
		double z,
		double w);

		CGDLL_API void cgSetParameter1fv(CGparameter param, const float *v);
		CGDLL_API void cgSetParameter2fv(CGparameter param, const float *v);
		CGDLL_API void cgSetParameter3fv(CGparameter param, const float *v);
		CGDLL_API void cgSetParameter4fv(CGparameter param, const float *v);
		CGDLL_API void cgSetParameter1dv(CGparameter param, const double *v);
		CGDLL_API void cgSetParameter2dv(CGparameter param, const double *v);
		CGDLL_API void cgSetParameter3dv(CGparameter param, const double *v);
		CGDLL_API void cgSetParameter4dv(CGparameter param, const double *v);

		CGDLL_API void cgSetMatrixParameterdr(CGparameter param, const double *matr
		ix);
		CGDLL_API void cgSetMatrixParameterfr(CGparameter param, const float *matri
		x);
		CGDLL_API void cgSetMatrixParameterdc(CGparameter param, const double *matr
		ix);
		CGDLL_API void cgSetMatrixParameterfc(CGparameter param, const float *matri
		x);

	/* Type Functions */	/* Type Functions */

	CGDLL_API const char *cgGetTypeString(CGtype type);	CGDLL_API const char *cgGetTypeString(CGtype type);
	CGDLL_API CGtype cgGetType(const char *type_string);	CGDLL_API CGtype cgGetType(const char *type_string);


		CGDLL_API CGtype cgGetNamedUserType(CGprogram program, const char *name);

		CGDLL_API int cgGetNumUserTypes(CGprogram program);
		CGDLL_API CGtype cgGetUserType(CGprogram program, int index);

		CGDLL_API int cgGetNumParentTypes(CGtype type);
		CGDLL_API CGtype cgGetParentType(CGtype type, int index);

		CGDLL_API CGbool cgIsParentType(CGtype parent, CGtype child);
		CGDLL_API CGbool cgIsInterfaceType(CGtype type);

	/* Resource Functions */	/* Resource Functions */

	CGDLL_API const char *cgGetResourceString(CGresource resource);	CGDLL_API const char *cgGetResourceString(CGresource resource);
	CGDLL_API CGresource cgGetResource(const char *resource_string);	CGDLL_API CGresource cgGetResource(const char *resource_string);


		/* Enum Functions */

		CGDLL_API const char *cgGetEnumString(CGenum en);
		CGDLL_API CGenum cgGetEnum(const char *enum_string);

	/* Profile Functions */	/* Profile Functions */

	CGDLL_API const char *cgGetProfileString(CGprofile profile);	CGDLL_API const char *cgGetProfileString(CGprofile profile);
	CGDLL_API CGprofile cgGetProfile(const char *profile_string);	CGDLL_API CGprofile cgGetProfile(const char *profile_string);

	/* Error Functions */	/* Error Functions */


	CGDLL_API CGerror cgGetError(void);	CGDLL_API CGerror cgGetError(void);
	CGDLL_API const char *cgGetErrorString(CGerror error);	CGDLL_API const char *cgGetErrorString(CGerror error);

		CGDLL_API const char cgGetLastErrorString(CGerror error);
	CGDLL_API void cgSetErrorCallback(CGerrorCallbackFunc func);	CGDLL_API void cgSetErrorCallback(CGerrorCallbackFunc func);
	CGDLL_API CGerrorCallbackFunc cgGetErrorCallback(void);	CGDLL_API CGerrorCallbackFunc cgGetErrorCallback(void);


	#ifdef __cplusplus	/* Misc Functions */
	}
	#endif


	#else	CGDLL_API const char *cgGetString(CGenum sname);


	#define cgCreateContext cgGL_DEPRECATEDAPI_CreateContext	/* Support for deprecated Cg 1.1 API */
	#define cgGetNextProgram cgGL_DEPRECATEDAPI_GetNextProgram
	#define cgGetLastListing cgGL_DEPRECATEDAPI_GetLastListing
	#define cgGetProgramProfile cgGL_DEPRECATEDAPI_ProgramProfile


	# include <Cg/cg_deprecated_api.h>	CGDLL_API CGparameter cgGetNextParameter_depr1_1(CGparameter current);
		CGDLL_API CGparameter cgGetNextLeafParameter_depr1_1(CGparameter current);

		#ifdef CG_DEPRECATED_1_1_API


		#define cgGetNextParameter cgGetNextParameter_depr1_1
		#define cgGetNextLeafParameter cgGetNextLeafParameter_depr1_1

		#endif

		#endif

		#ifdef __cplusplus
		}
	#endif	#endif

	#endif	#endif

End of changes. 24 change blocks.
	35 lines changed or deleted	131 lines changed or added

	cgGL.h	cgGL.h

	skipping to change at line 55	skipping to change at line 55
	* REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE,	* REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE,
	* HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING	* HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING
	* 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.
	*	*
	*/	*/

	#ifndef _cggl_h	#ifndef _cggl_h
	#define _cggl_h	#define _cggl_h


	#ifndef CG_DEPRECATED_API

	#include <Cg/cg.h>	#include <Cg/cg.h>

	/* Set up for either Win32 import/export/lib. */	/* Set up for either Win32 import/export/lib. */
	#ifndef CGGLDLL_API	#ifndef CGGLDLL_API
	#if WIN32	#if WIN32
	# include <windows.h>	# include <windows.h>
	#ifdef CGGLDLL_EXPORTS	#ifdef CGGLDLL_EXPORTS
	#define CGGLDLL_API __declspec(dllexport)	#define CGGLDLL_API __declspec(dllexport)
	#elif defined (CG_LIB)	#elif defined (CG_LIB)
	#define CGGLDLL_API	#define CGGLDLL_API

	skipping to change at line 125	skipping to change at line 123
	CGGLDLL_API void cgGLDisableProfile(CGprofile profile);	CGGLDLL_API void cgGLDisableProfile(CGprofile profile);

	CGGLDLL_API CGprofile cgGLGetLatestProfile(CGGLenum profile_type);	CGGLDLL_API CGprofile cgGLGetLatestProfile(CGGLenum profile_type);
	CGGLDLL_API void cgGLSetOptimalOptions(CGprofile profile);	CGGLDLL_API void cgGLSetOptimalOptions(CGprofile profile);

	/************************************************************************ **	/************************************************************************ **
	*** Program Managment Functions	*** Program Managment Functions
	************************************************************************ */	************************************************************************ */

	CGGLDLL_API void cgGLLoadProgram(CGprogram program);	CGGLDLL_API void cgGLLoadProgram(CGprogram program);

		CGGLDLL_API CGbool cgGLIsProgramLoaded(CGprogram program);
	CGGLDLL_API void cgGLBindProgram(CGprogram program);	CGGLDLL_API void cgGLBindProgram(CGprogram program);

		CGGLDLL_API void cgGLUnbindProgram(CGprofile profile);
		CGGLDLL_API GLuint cgGLGetProgramID(CGprogram program);

	/************************************************************************ **	/************************************************************************ **
	*** Parameter Managment Functions	*** Parameter Managment Functions
	************************************************************************ */	************************************************************************ */

	CGGLDLL_API void cgGLSetParameter1f(CGparameter param,	CGGLDLL_API void cgGLSetParameter1f(CGparameter param,
	float x);	float x);

	CGGLDLL_API void cgGLSetParameter2f(CGparameter param,	CGGLDLL_API void cgGLSetParameter2f(CGparameter param,
	float x,	float x,

	skipping to change at line 285	skipping to change at line 286

	CGGLDLL_API void cgGLGetParameterArray4d(CGparameter param,	CGGLDLL_API void cgGLGetParameterArray4d(CGparameter param,
	long offset,	long offset,
	long nelements,	long nelements,
	double *v);	double *v);

	CGGLDLL_API void cgGLSetParameterPointer(CGparameter param,	CGGLDLL_API void cgGLSetParameterPointer(CGparameter param,
	GLint fsize,	GLint fsize,
	GLenum type,	GLenum type,
	GLsizei stride,	GLsizei stride,

	GLvoid *pointer);	const GLvoid *pointer);

	CGGLDLL_API void cgGLEnableClientState(CGparameter param);	CGGLDLL_API void cgGLEnableClientState(CGparameter param);
	CGGLDLL_API void cgGLDisableClientState(CGparameter param);	CGGLDLL_API void cgGLDisableClientState(CGparameter param);

	/************************************************************************ **	/************************************************************************ **
	*** Matrix Parameter Managment Functions	*** Matrix Parameter Managment Functions
	************************************************************************ */	************************************************************************ */


	CGGLDLL_API void cgGLSetMatrixParameterdr(CGparameter param, const double *	CGGLDLL_API void cgGLSetMatrixParameterdr(CGparameter param,
	matrix);	const double *matrix);
	CGGLDLL_API void cgGLSetMatrixParameterfr(CGparameter param, const float *m	CGGLDLL_API void cgGLSetMatrixParameterfr(CGparameter param,
	atrix);	const float *matrix);
	CGGLDLL_API void cgGLSetMatrixParameterdc(CGparameter param, const double *	CGGLDLL_API void cgGLSetMatrixParameterdc(CGparameter param,
	matrix);	const double *matrix);
	CGGLDLL_API void cgGLSetMatrixParameterfc(CGparameter param, const float *m	CGGLDLL_API void cgGLSetMatrixParameterfc(CGparameter param,
	atrix);	const float *matrix);

	CGGLDLL_API void cgGLGetMatrixParameterdr(CGparameter param, double *matrix );	CGGLDLL_API void cgGLGetMatrixParameterdr(CGparameter param, double *matrix );
	CGGLDLL_API void cgGLGetMatrixParameterfr(CGparameter param, float *matrix) ;	CGGLDLL_API void cgGLGetMatrixParameterfr(CGparameter param, float *matrix) ;
	CGGLDLL_API void cgGLGetMatrixParameterdc(CGparameter param, double *matrix );	CGGLDLL_API void cgGLGetMatrixParameterdc(CGparameter param, double *matrix );
	CGGLDLL_API void cgGLGetMatrixParameterfc(CGparameter param, float *matrix) ;	CGGLDLL_API void cgGLGetMatrixParameterfc(CGparameter param, float *matrix) ;

	CGGLDLL_API void cgGLSetStateMatrixParameter(CGparameter param,	CGGLDLL_API void cgGLSetStateMatrixParameter(CGparameter param,
	CGGLenum matrix,	CGGLenum matrix,
	CGGLenum transform);	CGGLenum transform);


	skipping to change at line 357	skipping to change at line 362

	/************************************************************************ **	/************************************************************************ **
	*** Texture Parameter Managment Functions	*** Texture Parameter Managment Functions
	************************************************************************ */	************************************************************************ */

	CGGLDLL_API void cgGLSetTextureParameter(CGparameter param, GLuint texobj);	CGGLDLL_API void cgGLSetTextureParameter(CGparameter param, GLuint texobj);
	CGGLDLL_API GLuint cgGLGetTextureParameter(CGparameter param);	CGGLDLL_API GLuint cgGLGetTextureParameter(CGparameter param);
	CGGLDLL_API void cgGLEnableTextureParameter(CGparameter param);	CGGLDLL_API void cgGLEnableTextureParameter(CGparameter param);
	CGGLDLL_API void cgGLDisableTextureParameter(CGparameter param);	CGGLDLL_API void cgGLDisableTextureParameter(CGparameter param);
	CGGLDLL_API GLenum cgGLGetTextureEnum(CGparameter param);	CGGLDLL_API GLenum cgGLGetTextureEnum(CGparameter param);

		CGGLDLL_API void cgGLSetManageTextureParameters(CGcontext ctx, CGbool flag)
		;
		CGGLDLL_API CGbool cgGLGetManageTextureParameters(CGcontext ctx);

	#endif	#endif

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif


	#else

	#define cgGLLoadProgram cgGLDEPRECATEDAPI_LoadProgram
	#define cgGLBindProgram cgGLDEPRECATEDAPI_BindProgram
	#define cgGLEnableClientState cgGL_DEPRECATEDAPI_EnableClientState
	#define cgGLDisableClientState cgGL_DEPRECATEDAPI_DisableClientState

	#include <Cg/cgGL_deprecated_api.h>

	#endif

	#endif	#endif

End of changes. 7 change blocks.
	22 lines changed or deleted	15 lines changed or added

	cg_bindlocations.h	cg_bindlocations.h

	skipping to change at line 71	skipping to change at line 71
	* name : The name of the location.	* name : The name of the location.
	* enum_name : The C enumerant.	* enum_name : The C enumerant.
	* compiler_name : The name of the location within the compiler syntax.	* compiler_name : The name of the location within the compiler syntax.
	* int_id : Integer enumerant associated with this bind location .	* int_id : Integer enumerant associated with this bind location .
	* addressable : The bind location must have an integer address	* addressable : The bind location must have an integer address
	* associated with it.	* associated with it.
	* ParamType : the cgParamType of this register.	* ParamType : the cgParamType of this register.
	*	*
	*/	*/


	CG_BINDLOCATION_MACRO(TexUnit0,CG_TEXUNIT0,"texunit 0",2048,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit0,CG_TEXUNIT0,"texunit 0",2048,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit1,CG_TEXUNIT1,"texunit 1",2049,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit1,CG_TEXUNIT1,"texunit 1",2049,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit2,CG_TEXUNIT2,"texunit 2",2050,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit2,CG_TEXUNIT2,"texunit 2",2050,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit3,CG_TEXUNIT3,"texunit 3",2051,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit3,CG_TEXUNIT3,"texunit 3",2051,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit4,CG_TEXUNIT4,"texunit 4",2052,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit4,CG_TEXUNIT4,"texunit 4",2052,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit5,CG_TEXUNIT5,"texunit 5",2053,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit5,CG_TEXUNIT5,"texunit 5",2053,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit6,CG_TEXUNIT6,"texunit 6",2054,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit6,CG_TEXUNIT6,"texunit 6",2054,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit7,CG_TEXUNIT7,"texunit 7",2055,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit7,CG_TEXUNIT7,"texunit 7",2055,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit8,CG_TEXUNIT8,"texunit 8",2056,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit8,CG_TEXUNIT8,"texunit 8",2056,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit9,CG_TEXUNIT9,"texunit 9",2057,0,cgTexObjParam	CG_BINDLOCATION_MACRO(TexUnit9,CG_TEXUNIT9,"texunit 9",2057,0,CG_TEXOBJ_PAR
	)	AM)
	CG_BINDLOCATION_MACRO(TexUnit10,CG_TEXUNIT10,"texunit 10",2058,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit10,CG_TEXUNIT10,"texunit 10",2058,0,CG_TEXOBJ_
	ram)	PARAM)
	CG_BINDLOCATION_MACRO(TexUnit11,CG_TEXUNIT11,"texunit 11",2059,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit11,CG_TEXUNIT11,"texunit 11",2059,0,CG_TEXOBJ_
	ram)	PARAM)
	CG_BINDLOCATION_MACRO(TexUnit12,CG_TEXUNIT12,"texunit 12",2060,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit12,CG_TEXUNIT12,"texunit 12",2060,0,CG_TEXOBJ_
	ram)	PARAM)
	CG_BINDLOCATION_MACRO(TexUnit13,CG_TEXUNIT13,"texunit 13",2061,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit13,CG_TEXUNIT13,"texunit 13",2061,0,CG_TEXOBJ_
	ram)	PARAM)
	CG_BINDLOCATION_MACRO(TexUnit14,CG_TEXUNIT14,"texunit 14",2062,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit14,CG_TEXUNIT14,"texunit 14",2062,0,CG_TEXOBJ_
	ram)	PARAM)
	CG_BINDLOCATION_MACRO(TexUnit15,CG_TEXUNIT15,"texunit 15",2063,0,cgTexObjPa	CG_BINDLOCATION_MACRO(TexUnit15,CG_TEXUNIT15,"texunit 15",2063,0,CG_TEXOBJ_
	ram)	PARAM)


	CG_BINDLOCATION_MACRO(Attr0,CG_ATTR0,"ATTR0",2113,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr0,CG_ATTR0,"ATTR0",2113,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr1,CG_ATTR1,"ATTR1",2114,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr1,CG_ATTR1,"ATTR1",2114,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr2,CG_ATTR2,"ATTR2",2115,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr2,CG_ATTR2,"ATTR2",2115,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr3,CG_ATTR3,"ATTR3",2116,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr3,CG_ATTR3,"ATTR3",2116,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr4,CG_ATTR4,"ATTR4",2117,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr4,CG_ATTR4,"ATTR4",2117,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr5,CG_ATTR5,"ATTR5",2118,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr5,CG_ATTR5,"ATTR5",2118,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr6,CG_ATTR6,"ATTR6",2119,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr6,CG_ATTR6,"ATTR6",2119,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr7,CG_ATTR7,"ATTR7",2120,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr7,CG_ATTR7,"ATTR7",2120,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr8,CG_ATTR8,"ATTR8",2121,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr8,CG_ATTR8,"ATTR8",2121,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr9,CG_ATTR9,"ATTR9",2122,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Attr9,CG_ATTR9,"ATTR9",2122,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr10,CG_ATTR10,"ATTR10",2123,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Attr10,CG_ATTR10,"ATTR10",2123,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Attr11,CG_ATTR11,"ATTR11",2124,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr11,CG_ATTR11,"ATTR11",2124,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Attr12,CG_ATTR12,"ATTR12",2125,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Attr13,CG_ATTR13,"ATTR13",2126,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr12,CG_ATTR12,"ATTR12",2125,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Attr14,CG_ATTR14,"ATTR14",2127,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Attr15,CG_ATTR15,"ATTR15",2128,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Attr13,CG_ATTR13,"ATTR13",2126,0,cgConnectorMemberPar
	am)
	CG_BINDLOCATION_MACRO(Attr14,CG_ATTR14,"ATTR14",2127,0,cgConnectorMemberPar
	am)
	CG_BINDLOCATION_MACRO(Attr15,CG_ATTR15,"ATTR15",2128,0,cgConnectorMemberPar
	am)


	CG_BINDLOCATION_MACRO(VertUniform,CG_C,"c",2178,1,cgUniformParam)	CG_BINDLOCATION_MACRO(VertUniform,CG_C,"c",2178,1,CGI_UNIFORM_PARAM)


	CG_BINDLOCATION_MACRO(Tex0,CG_TEX0,"TEX0",2179,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex0,CG_TEX0,"TEX0",2179,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex1,CG_TEX1,"TEX1",2180,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex1,CG_TEX1,"TEX1",2180,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex2,CG_TEX2,"TEX2",2181,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex2,CG_TEX2,"TEX2",2181,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex3,CG_TEX3,"TEX3",2192,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex3,CG_TEX3,"TEX3",2192,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex4,CG_TEX4,"TEX4",2193,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex4,CG_TEX4,"TEX4",2193,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex5,CG_TEX5,"TEX5",2194,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex5,CG_TEX5,"TEX5",2194,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex6,CG_TEX6,"TEX6",2195,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex6,CG_TEX6,"TEX6",2195,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Tex7,CG_TEX7,"TEX7",2196,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Tex7,CG_TEX7,"TEX7",2196,0,CG_VARYING_PARAM)


	CG_BINDLOCATION_MACRO(HPos,CG_HPOS,"HPOS",2243,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(HPos,CG_HPOS,"HPOS",2243,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Col0,CG_COL0,"COL0",2245,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Col0,CG_COL0,"COL0",2245,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Col1,CG_COL1,"COL1",2246,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Col1,CG_COL1,"COL1",2246,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Col2,CG_COL2,"COL2",2247,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Col2,CG_COL2,"COL2",2247,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Col3,CG_COL3,"COL3",2248,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(Col3,CG_COL3,"COL3",2248,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(PSiz,CG_PSIZ,"PSIZ",2309,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(PSiz,CG_PSIZ,"PSIZ",2309,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(WPos,CG_WPOS,"WPOS",2373,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(WPos,CG_WPOS,"WPOS",2373,0,CG_VARYING_PARAM)


	CG_BINDLOCATION_MACRO(Position0,CG_POSITION0,"POSITION0",2437,0,cgConnector	CG_BINDLOCATION_MACRO(Position0,CG_POSITION0,"POSITION0",2437,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position1,CG_POSITION1,"POSITION1",2438,0,cgConnector	CG_BINDLOCATION_MACRO(Position1,CG_POSITION1,"POSITION1",2438,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position2,CG_POSITION2,"POSITION2",2439,0,cgConnector	CG_BINDLOCATION_MACRO(Position2,CG_POSITION2,"POSITION2",2439,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position3,CG_POSITION3,"POSITION3",2440,0,cgConnector	CG_BINDLOCATION_MACRO(Position3,CG_POSITION3,"POSITION3",2440,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position4,CG_POSITION4,"POSITION4",2441,0,cgConnector	CG_BINDLOCATION_MACRO(Position4,CG_POSITION4,"POSITION4",2441,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position5,CG_POSITION5,"POSITION5",2442,0,cgConnector	CG_BINDLOCATION_MACRO(Position5,CG_POSITION5,"POSITION5",2442,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position6,CG_POSITION6,"POSITION6",2443,0,cgConnector	CG_BINDLOCATION_MACRO(Position6,CG_POSITION6,"POSITION6",2443,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position7,CG_POSITION7,"POSITION7",2444,0,cgConnector	CG_BINDLOCATION_MACRO(Position7,CG_POSITION7,"POSITION7",2444,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position8,CG_POSITION8,"POSITION8",2445,0,cgConnector	CG_BINDLOCATION_MACRO(Position8,CG_POSITION8,"POSITION8",2445,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position9,CG_POSITION9,"POSITION9",2446,0,cgConnector	CG_BINDLOCATION_MACRO(Position9,CG_POSITION9,"POSITION9",2446,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Position10,CG_POSITION10,"POSITION10",2447,0,cgConnec	CG_BINDLOCATION_MACRO(Position10,CG_POSITION10,"POSITION10",2447,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Position11,CG_POSITION11,"POSITION11",2448,0,cgConnec	CG_BINDLOCATION_MACRO(Position11,CG_POSITION11,"POSITION11",2448,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Position12,CG_POSITION12,"POSITION12",2449,0,cgConnec	CG_BINDLOCATION_MACRO(Position12,CG_POSITION12,"POSITION12",2449,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Position13,CG_POSITION13,"POSITION13",2450,0,cgConnec	CG_BINDLOCATION_MACRO(Position13,CG_POSITION13,"POSITION13",2450,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Position14,CG_POSITION14,"POSITION14",2451,0,cgConnec	CG_BINDLOCATION_MACRO(Position14,CG_POSITION14,"POSITION14",2451,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Position15,CG_POSITION15,"POSITION15",2452,0,cgConnec	CG_BINDLOCATION_MACRO(Position15,CG_POSITION15,"POSITION15",2452,0,CG_VARYI
	torMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Diffuse0,CG_DIFFUSE0,"DIFFUSE0",2501,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Diffuse0,CG_DIFFUSE0,"DIFFUSE0",2501,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent0,CG_TANGENT0,"TANGENT0",2565,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent0,CG_TANGENT0,"TANGENT0",2565,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent1,CG_TANGENT1,"TANGENT1",2566,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent1,CG_TANGENT1,"TANGENT1",2566,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent2,CG_TANGENT2,"TANGENT2",2567,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent2,CG_TANGENT2,"TANGENT2",2567,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent3,CG_TANGENT3,"TANGENT3",2568,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent3,CG_TANGENT3,"TANGENT3",2568,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent4,CG_TANGENT4,"TANGENT4",2569,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent4,CG_TANGENT4,"TANGENT4",2569,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent5,CG_TANGENT5,"TANGENT5",2570,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent5,CG_TANGENT5,"TANGENT5",2570,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent6,CG_TANGENT6,"TANGENT6",2571,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent6,CG_TANGENT6,"TANGENT6",2571,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent7,CG_TANGENT7,"TANGENT7",2572,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent7,CG_TANGENT7,"TANGENT7",2572,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent8,CG_TANGENT8,"TANGENT8",2573,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent8,CG_TANGENT8,"TANGENT8",2573,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent9,CG_TANGENT9,"TANGENT9",2574,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Tangent9,CG_TANGENT9,"TANGENT9",2574,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(Tangent10,CG_TANGENT10,"TANGENT10",2575,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent10,CG_TANGENT10,"TANGENT10",2575,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Tangent11,CG_TANGENT11,"TANGENT11",2576,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent11,CG_TANGENT11,"TANGENT11",2576,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Tangent12,CG_TANGENT12,"TANGENT12",2577,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent12,CG_TANGENT12,"TANGENT12",2577,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Tangent13,CG_TANGENT13,"TANGENT13",2578,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent13,CG_TANGENT13,"TANGENT13",2578,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Tangent14,CG_TANGENT14,"TANGENT14",2579,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent14,CG_TANGENT14,"TANGENT14",2579,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Tangent15,CG_TANGENT15,"TANGENT15",2580,0,cgConnector	CG_BINDLOCATION_MACRO(Tangent15,CG_TANGENT15,"TANGENT15",2580,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(Specular0,CG_SPECULAR0,"SPECULAR0",2629,0,cgConnector	CG_BINDLOCATION_MACRO(Specular0,CG_SPECULAR0,"SPECULAR0",2629,0,CG_VARYING_
	MemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices0,CG_BLENDINDICES0,"BLENDINDICES0",2693,0	CG_BINDLOCATION_MACRO(BlendIndices0,CG_BLENDINDICES0,"BLENDINDICES0",2693,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices1,CG_BLENDINDICES1,"BLENDINDICES1",2694,0	CG_BINDLOCATION_MACRO(BlendIndices1,CG_BLENDINDICES1,"BLENDINDICES1",2694,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices2,CG_BLENDINDICES2,"BLENDINDICES2",2695,0	CG_BINDLOCATION_MACRO(BlendIndices2,CG_BLENDINDICES2,"BLENDINDICES2",2695,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices3,CG_BLENDINDICES3,"BLENDINDICES3",2696,0	CG_BINDLOCATION_MACRO(BlendIndices3,CG_BLENDINDICES3,"BLENDINDICES3",2696,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices4,CG_BLENDINDICES4,"BLENDINDICES4",2697,0	CG_BINDLOCATION_MACRO(BlendIndices4,CG_BLENDINDICES4,"BLENDINDICES4",2697,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices5,CG_BLENDINDICES5,"BLENDINDICES5",2698,0	CG_BINDLOCATION_MACRO(BlendIndices5,CG_BLENDINDICES5,"BLENDINDICES5",2698,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices6,CG_BLENDINDICES6,"BLENDINDICES6",2699,0	CG_BINDLOCATION_MACRO(BlendIndices6,CG_BLENDINDICES6,"BLENDINDICES6",2699,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices7,CG_BLENDINDICES7,"BLENDINDICES7",2700,0	CG_BINDLOCATION_MACRO(BlendIndices7,CG_BLENDINDICES7,"BLENDINDICES7",2700,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices8,CG_BLENDINDICES8,"BLENDINDICES8",2701,0	CG_BINDLOCATION_MACRO(BlendIndices8,CG_BLENDINDICES8,"BLENDINDICES8",2701,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices9,CG_BLENDINDICES9,"BLENDINDICES9",2702,0	CG_BINDLOCATION_MACRO(BlendIndices9,CG_BLENDINDICES9,"BLENDINDICES9",2702,0
	,cgConnectorMemberParam)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices10,CG_BLENDINDICES10,"BLENDINDICES10",270	CG_BINDLOCATION_MACRO(BlendIndices10,CG_BLENDINDICES10,"BLENDINDICES10",270
	3,0,cgConnectorMemberParam)	3,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices11,CG_BLENDINDICES11,"BLENDINDICES11",270	CG_BINDLOCATION_MACRO(BlendIndices11,CG_BLENDINDICES11,"BLENDINDICES11",270
	4,0,cgConnectorMemberParam)	4,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices12,CG_BLENDINDICES12,"BLENDINDICES12",270	CG_BINDLOCATION_MACRO(BlendIndices12,CG_BLENDINDICES12,"BLENDINDICES12",270
	5,0,cgConnectorMemberParam)	5,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices13,CG_BLENDINDICES13,"BLENDINDICES13",270	CG_BINDLOCATION_MACRO(BlendIndices13,CG_BLENDINDICES13,"BLENDINDICES13",270
	6,0,cgConnectorMemberParam)	6,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices14,CG_BLENDINDICES14,"BLENDINDICES14",270	CG_BINDLOCATION_MACRO(BlendIndices14,CG_BLENDINDICES14,"BLENDINDICES14",270
	7,0,cgConnectorMemberParam)	7,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BlendIndices15,CG_BLENDINDICES15,"BLENDINDICES15",270	CG_BINDLOCATION_MACRO(BlendIndices15,CG_BLENDINDICES15,"BLENDINDICES15",270
	8,0,cgConnectorMemberParam)	8,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color0,CG_COLOR0,"COLOR0",2757,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color0,CG_COLOR0,"COLOR0",2757,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color1,CG_COLOR1,"COLOR1",2758,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color1,CG_COLOR1,"COLOR1",2758,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color2,CG_COLOR2,"COLOR2",2759,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color3,CG_COLOR3,"COLOR3",2760,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color2,CG_COLOR2,"COLOR2",2759,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color4,CG_COLOR4,"COLOR4",2761,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color5,CG_COLOR5,"COLOR5",2762,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color3,CG_COLOR3,"COLOR3",2760,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color6,CG_COLOR6,"COLOR6",2763,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color7,CG_COLOR7,"COLOR7",2764,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color4,CG_COLOR4,"COLOR4",2761,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color8,CG_COLOR8,"COLOR8",2765,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color9,CG_COLOR9,"COLOR9",2766,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color5,CG_COLOR5,"COLOR5",2762,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color10,CG_COLOR10,"COLOR10",2767,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color11,CG_COLOR11,"COLOR11",2768,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color6,CG_COLOR6,"COLOR6",2763,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color12,CG_COLOR12,"COLOR12",2769,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color13,CG_COLOR13,"COLOR13",2770,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color7,CG_COLOR7,"COLOR7",2764,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(Color14,CG_COLOR14,"COLOR14",2771,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(Color15,CG_COLOR15,"COLOR15",2772,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color8,CG_COLOR8,"COLOR8",2765,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(PSize0,CG_PSIZE0,"PSIZE0",2821,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(PSize1,CG_PSIZE1,"PSIZE1",2822,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color9,CG_COLOR9,"COLOR9",2766,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(PSize2,CG_PSIZE2,"PSIZE2",2823,0,CG_VARYING_PARAM)
	am)	CG_BINDLOCATION_MACRO(PSize3,CG_PSIZE3,"PSIZE3",2824,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color10,CG_COLOR10,"COLOR10",2767,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize4,CG_PSIZE4,"PSIZE4",2825,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize5,CG_PSIZE5,"PSIZE5",2826,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color11,CG_COLOR11,"COLOR11",2768,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize6,CG_PSIZE6,"PSIZE6",2827,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize7,CG_PSIZE7,"PSIZE7",2828,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color12,CG_COLOR12,"COLOR12",2769,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize8,CG_PSIZE8,"PSIZE8",2829,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize9,CG_PSIZE9,"PSIZE9",2830,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color13,CG_COLOR13,"COLOR13",2770,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize10,CG_PSIZE10,"PSIZE10",2831,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize11,CG_PSIZE11,"PSIZE11",2832,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color14,CG_COLOR14,"COLOR14",2771,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize12,CG_PSIZE12,"PSIZE12",2833,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize13,CG_PSIZE13,"PSIZE13",2834,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(Color15,CG_COLOR15,"COLOR15",2772,0,cgConnectorMember	CG_BINDLOCATION_MACRO(PSize14,CG_PSIZE14,"PSIZE14",2835,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(PSize15,CG_PSIZE15,"PSIZE15",2836,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(PSize0,CG_PSIZE0,"PSIZE0",2821,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal0,CG_BINORMAL0,"BINORMAL0",2885,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize1,CG_PSIZE1,"PSIZE1",2822,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal1,CG_BINORMAL1,"BINORMAL1",2886,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize2,CG_PSIZE2,"PSIZE2",2823,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal2,CG_BINORMAL2,"BINORMAL2",2887,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize3,CG_PSIZE3,"PSIZE3",2824,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal3,CG_BINORMAL3,"BINORMAL3",2888,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize4,CG_PSIZE4,"PSIZE4",2825,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal4,CG_BINORMAL4,"BINORMAL4",2889,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize5,CG_PSIZE5,"PSIZE5",2826,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal5,CG_BINORMAL5,"BINORMAL5",2890,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize6,CG_PSIZE6,"PSIZE6",2827,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal6,CG_BINORMAL6,"BINORMAL6",2891,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize7,CG_PSIZE7,"PSIZE7",2828,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal7,CG_BINORMAL7,"BINORMAL7",2892,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize8,CG_PSIZE8,"PSIZE8",2829,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal8,CG_BINORMAL8,"BINORMAL8",2893,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize9,CG_PSIZE9,"PSIZE9",2830,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BiNormal9,CG_BINORMAL9,"BINORMAL9",2894,0,CG_VARYING_
	am)	PARAM)
	CG_BINDLOCATION_MACRO(PSize10,CG_PSIZE10,"PSIZE10",2831,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal10,CG_BINORMAL10,"BINORMAL10",2895,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(PSize11,CG_PSIZE11,"PSIZE11",2832,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal11,CG_BINORMAL11,"BINORMAL11",2896,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(PSize12,CG_PSIZE12,"PSIZE12",2833,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal12,CG_BINORMAL12,"BINORMAL12",2897,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(PSize13,CG_PSIZE13,"PSIZE13",2834,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal13,CG_BINORMAL13,"BINORMAL13",2898,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(PSize14,CG_PSIZE14,"PSIZE14",2835,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal14,CG_BINORMAL14,"BINORMAL14",2899,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(PSize15,CG_PSIZE15,"PSIZE15",2836,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BiNormal15,CG_BINORMAL15,"BINORMAL15",2900,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal0,CG_BINORMAL0,"BINORMAL0",2885,0,cgConnector	CG_BINDLOCATION_MACRO(FOG0,CG_FOG0,"FOG0",2917,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG1,CG_FOG1,"FOG1",2918,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal1,CG_BINORMAL1,"BINORMAL1",2886,0,cgConnector	CG_BINDLOCATION_MACRO(FOG2,CG_FOG2,"FOG2",2919,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG3,CG_FOG3,"FOG3",2920,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal2,CG_BINORMAL2,"BINORMAL2",2887,0,cgConnector	CG_BINDLOCATION_MACRO(FOG4,CG_FOG4,"FOG4",2921,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG5,CG_FOG5,"FOG5",2922,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal3,CG_BINORMAL3,"BINORMAL3",2888,0,cgConnector	CG_BINDLOCATION_MACRO(FOG6,CG_FOG6,"FOG6",2923,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG7,CG_FOG7,"FOG7",2924,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal4,CG_BINORMAL4,"BINORMAL4",2889,0,cgConnector	CG_BINDLOCATION_MACRO(FOG8,CG_FOG8,"FOG8",2925,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG9,CG_FOG9,"FOG9",2926,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal5,CG_BINORMAL5,"BINORMAL5",2890,0,cgConnector	CG_BINDLOCATION_MACRO(FOG10,CG_FOG10,"FOG10",2927,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG11,CG_FOG11,"FOG11",2928,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal6,CG_BINORMAL6,"BINORMAL6",2891,0,cgConnector	CG_BINDLOCATION_MACRO(FOG12,CG_FOG12,"FOG12",2929,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG13,CG_FOG13,"FOG13",2930,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal7,CG_BINORMAL7,"BINORMAL7",2892,0,cgConnector	CG_BINDLOCATION_MACRO(FOG14,CG_FOG14,"FOG14",2931,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(FOG15,CG_FOG15,"FOG15",2932,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal8,CG_BINORMAL8,"BINORMAL8",2893,0,cgConnector	CG_BINDLOCATION_MACRO(DEPTH0,CG_DEPTH0,"DEPTH0",2933,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(DEPTH1,CG_DEPTH1,"DEPTH1",2934,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal9,CG_BINORMAL9,"BINORMAL9",2894,0,cgConnector	CG_BINDLOCATION_MACRO(DEPTH2,CG_DEPTH2,"DEPTH2",2935,0,CG_VARYING_PARAM)
	MemberParam)	CG_BINDLOCATION_MACRO(DEPTH3,CG_DEPTH3,"DEPTH3",2936,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal10,CG_BINORMAL10,"BINORMAL10",2895,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH4,CG_DEPTH4,"DEPTH4",2937,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH5,CG_DEPTH5,"DEPTH5",2938,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal11,CG_BINORMAL11,"BINORMAL11",2896,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH6,CG_DEPTH6,"DEPTH6",2939,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH7,CG_DEPTH7,"DEPTH7",2940,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal12,CG_BINORMAL12,"BINORMAL12",2897,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH8,CG_DEPTH8,"DEPTH8",2941,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH9,CG_DEPTH9,"DEPTH9",29542,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal13,CG_BINORMAL13,"BINORMAL13",2898,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH10,CG_DEPTH10,"DEPTH10",2943,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH11,CG_DEPTH11,"DEPTH11",2944,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal14,CG_BINORMAL14,"BINORMAL14",2899,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH12,CG_DEPTH12,"DEPTH12",2945,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH13,CG_DEPTH13,"DEPTH13",2946,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(BiNormal15,CG_BINORMAL15,"BINORMAL15",2900,0,cgConnec	CG_BINDLOCATION_MACRO(DEPTH14,CG_DEPTH14,"DEPTH14",2947,0,CG_VARYING_PARAM)
	torMemberParam)	CG_BINDLOCATION_MACRO(DEPTH15,CG_DEPTH15,"DEPTH15",2948,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG0,CG_FOG0,"FOG0",2917,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE0,CG_SAMPLE0,"SAMPLE0",2949,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG1,CG_FOG1,"FOG1",2918,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE1,CG_SAMPLE1,"SAMPLE1",2950,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG2,CG_FOG2,"FOG2",2919,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE2,CG_SAMPLE2,"SAMPLE2",2951,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG3,CG_FOG3,"FOG3",2920,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE3,CG_SAMPLE3,"SAMPLE3",2952,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG4,CG_FOG4,"FOG4",2921,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE4,CG_SAMPLE4,"SAMPLE4",2953,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG5,CG_FOG5,"FOG5",2922,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE5,CG_SAMPLE5,"SAMPLE5",2954,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG6,CG_FOG6,"FOG6",2923,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE6,CG_SAMPLE6,"SAMPLE6",2955,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG7,CG_FOG7,"FOG7",2924,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE7,CG_SAMPLE7,"SAMPLE7",2956,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG8,CG_FOG8,"FOG8",2925,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE8,CG_SAMPLE8,"SAMPLE8",2957,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG9,CG_FOG9,"FOG9",2926,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE9,CG_SAMPLE9,"SAMPLE9",2958,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(FOG10,CG_FOG10,"FOG10",2927,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE10,CG_SAMPLE10,"SAMPLE10",2959,0,CG_VARYING_PAR
	CG_BINDLOCATION_MACRO(FOG11,CG_FOG11,"FOG11",2928,0,cgConnectorMemberParam)	AM)
	CG_BINDLOCATION_MACRO(FOG12,CG_FOG12,"FOG12",2929,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE11,CG_SAMPLE11,"SAMPLE11",2960,0,CG_VARYING_PAR
	CG_BINDLOCATION_MACRO(FOG13,CG_FOG13,"FOG13",2930,0,cgConnectorMemberParam)	AM)
	CG_BINDLOCATION_MACRO(FOG14,CG_FOG14,"FOG14",2931,0,cgConnectorMemberParam)	CG_BINDLOCATION_MACRO(SAMPLE12,CG_SAMPLE12,"SAMPLE12",2961,0,CG_VARYING_PAR
	CG_BINDLOCATION_MACRO(FOG15,CG_FOG15,"FOG15",2932,0,cgConnectorMemberParam)	AM)
	CG_BINDLOCATION_MACRO(DEPTH0,CG_DEPTH0,"DEPTH0",2933,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(SAMPLE13,CG_SAMPLE13,"SAMPLE13",2962,0,CG_VARYING_PAR
	am)	AM)
	CG_BINDLOCATION_MACRO(DEPTH1,CG_DEPTH1,"DEPTH1",2934,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(SAMPLE14,CG_SAMPLE14,"SAMPLE14",2963,0,CG_VARYING_PAR
	am)	AM)
	CG_BINDLOCATION_MACRO(DEPTH2,CG_DEPTH2,"DEPTH2",2935,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(SAMPLE15,CG_SAMPLE15,"SAMPLE15",2964,0,CG_VARYING_PAR
	am)	AM)
	CG_BINDLOCATION_MACRO(DEPTH3,CG_DEPTH3,"DEPTH3",2936,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight0,CG_BLENDWEIGHT0,"BLENDWEIGHT0",3028,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH4,CG_DEPTH4,"DEPTH4",2937,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight1,CG_BLENDWEIGHT1,"BLENDWEIGHT1",3029,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH5,CG_DEPTH5,"DEPTH5",2938,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight2,CG_BLENDWEIGHT2,"BLENDWEIGHT2",3030,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH6,CG_DEPTH6,"DEPTH6",2939,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight3,CG_BLENDWEIGHT3,"BLENDWEIGHT3",3031,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH7,CG_DEPTH7,"DEPTH7",2940,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight4,CG_BLENDWEIGHT4,"BLENDWEIGHT4",3032,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH8,CG_DEPTH8,"DEPTH8",2941,0,cgConnectorMemberPar	CG_BINDLOCATION_MACRO(BlendWeight5,CG_BLENDWEIGHT5,"BLENDWEIGHT5",3033,0,CG
	am)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH9,CG_DEPTH9,"DEPTH9",29542,0,cgConnectorMemberPa	CG_BINDLOCATION_MACRO(BlendWeight6,CG_BLENDWEIGHT6,"BLENDWEIGHT6",3034,0,CG
	ram)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH10,CG_DEPTH10,"DEPTH10",2943,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight7,CG_BLENDWEIGHT7,"BLENDWEIGHT7",3035,0,CG
	Param)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH11,CG_DEPTH11,"DEPTH11",2944,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight8,CG_BLENDWEIGHT8,"BLENDWEIGHT8",3036,0,CG
	Param)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH12,CG_DEPTH12,"DEPTH12",2945,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight9,CG_BLENDWEIGHT9,"BLENDWEIGHT9",3037,0,CG
	Param)	_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH13,CG_DEPTH13,"DEPTH13",2946,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight10,CG_BLENDWEIGHT10,"BLENDWEIGHT10",3038,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH14,CG_DEPTH14,"DEPTH14",2947,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight11,CG_BLENDWEIGHT11,"BLENDWEIGHT11",3039,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(DEPTH15,CG_DEPTH15,"DEPTH15",2948,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight12,CG_BLENDWEIGHT12,"BLENDWEIGHT12",3040,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE0,CG_SAMPLE0,"SAMPLE0",2949,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight13,CG_BLENDWEIGHT13,"BLENDWEIGHT13",3041,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE1,CG_SAMPLE1,"SAMPLE1",2950,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight14,CG_BLENDWEIGHT14,"BLENDWEIGHT14",3042,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE2,CG_SAMPLE2,"SAMPLE2",2951,0,cgConnectorMember	CG_BINDLOCATION_MACRO(BlendWeight15,CG_BLENDWEIGHT15,"BLENDWEIGHT15",3043,0
	Param)	,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE3,CG_SAMPLE3,"SAMPLE3",2952,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal0,CG_NORMAL0,"NORMAL0",3092,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(Normal1,CG_NORMAL1,"NORMAL1",3093,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE4,CG_SAMPLE4,"SAMPLE4",2953,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal2,CG_NORMAL2,"NORMAL2",3094,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(Normal3,CG_NORMAL3,"NORMAL3",3095,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE5,CG_SAMPLE5,"SAMPLE5",2954,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal4,CG_NORMAL4,"NORMAL4",3096,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(Normal5,CG_NORMAL5,"NORMAL5",3097,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE6,CG_SAMPLE6,"SAMPLE6",2955,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal6,CG_NORMAL6,"NORMAL6",3098,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(Normal7,CG_NORMAL7,"NORMAL7",3099,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE7,CG_SAMPLE7,"SAMPLE7",2956,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal8,CG_NORMAL8,"NORMAL8",3100,0,CG_VARYING_PARAM)
	Param)	CG_BINDLOCATION_MACRO(Normal9,CG_NORMAL9,"NORMAL9",3101,0,CG_VARYING_PARAM)
	CG_BINDLOCATION_MACRO(SAMPLE8,CG_SAMPLE8,"SAMPLE8",2957,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal10,CG_NORMAL10,"NORMAL10",3102,0,CG_VARYING_PAR
	Param)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE9,CG_SAMPLE9,"SAMPLE9",2958,0,cgConnectorMember	CG_BINDLOCATION_MACRO(Normal11,CG_NORMAL11,"NORMAL11",3103,0,CG_VARYING_PAR
	Param)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE10,CG_SAMPLE10,"SAMPLE10",2959,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Normal12,CG_NORMAL12,"NORMAL12",3104,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE11,CG_SAMPLE11,"SAMPLE11",2960,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Normal13,CG_NORMAL13,"NORMAL13",3105,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE12,CG_SAMPLE12,"SAMPLE12",2961,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Normal14,CG_NORMAL14,"NORMAL14",3106,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE13,CG_SAMPLE13,"SAMPLE13",2962,0,cgConnectorMem	CG_BINDLOCATION_MACRO(Normal15,CG_NORMAL15,"NORMAL15",3107,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE14,CG_SAMPLE14,"SAMPLE14",2963,0,cgConnectorMem	CG_BINDLOCATION_MACRO(FogCoord,CG_FOGCOORD,"FOGCOORD",3156,0,CG_VARYING_PAR
	berParam)	AM)
	CG_BINDLOCATION_MACRO(SAMPLE15,CG_SAMPLE15,"SAMPLE15",2964,0,cgConnectorMem	CG_BINDLOCATION_MACRO(TexCoord0,CG_TEXCOORD0,"TEXCOORD0",3220,0,CG_VARYING_
	berParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight0,CG_BLENDWEIGHT0,"BLENDWEIGHT0",3028,0,cg	CG_BINDLOCATION_MACRO(TexCoord1,CG_TEXCOORD1,"TEXCOORD1",3221,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight1,CG_BLENDWEIGHT1,"BLENDWEIGHT1",3029,0,cg	CG_BINDLOCATION_MACRO(TexCoord2,CG_TEXCOORD2,"TEXCOORD2",3222,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight2,CG_BLENDWEIGHT2,"BLENDWEIGHT2",3030,0,cg	CG_BINDLOCATION_MACRO(TexCoord3,CG_TEXCOORD3,"TEXCOORD3",3223,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight3,CG_BLENDWEIGHT3,"BLENDWEIGHT3",3031,0,cg	CG_BINDLOCATION_MACRO(TexCoord4,CG_TEXCOORD4,"TEXCOORD4",3224,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight4,CG_BLENDWEIGHT4,"BLENDWEIGHT4",3032,0,cg	CG_BINDLOCATION_MACRO(TexCoord5,CG_TEXCOORD5,"TEXCOORD5",3225,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight5,CG_BLENDWEIGHT5,"BLENDWEIGHT5",3033,0,cg	CG_BINDLOCATION_MACRO(TexCoord6,CG_TEXCOORD6,"TEXCOORD6",3226,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight6,CG_BLENDWEIGHT6,"BLENDWEIGHT6",3034,0,cg	CG_BINDLOCATION_MACRO(TexCoord7,CG_TEXCOORD7,"TEXCOORD7",3227,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight7,CG_BLENDWEIGHT7,"BLENDWEIGHT7",3035,0,cg	CG_BINDLOCATION_MACRO(TexCoord8,CG_TEXCOORD8,"TEXCOORD8",3228,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight8,CG_BLENDWEIGHT8,"BLENDWEIGHT8",3036,0,cg	CG_BINDLOCATION_MACRO(TexCoord9,CG_TEXCOORD9,"TEXCOORD9",3229,0,CG_VARYING_
	ConnectorMemberParam)	PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight9,CG_BLENDWEIGHT9,"BLENDWEIGHT9",3037,0,cg	CG_BINDLOCATION_MACRO(TexCoord10,CG_TEXCOORD10,"TEXCOORD10",3230,0,CG_VARYI
	ConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight10,CG_BLENDWEIGHT10,"BLENDWEIGHT10",3038,0	CG_BINDLOCATION_MACRO(TexCoord11,CG_TEXCOORD11,"TEXCOORD11",3231,0,CG_VARYI
	,cgConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight11,CG_BLENDWEIGHT11,"BLENDWEIGHT11",3039,0	CG_BINDLOCATION_MACRO(TexCoord12,CG_TEXCOORD12,"TEXCOORD12",3232,0,CG_VARYI
	,cgConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight12,CG_BLENDWEIGHT12,"BLENDWEIGHT12",3040,0	CG_BINDLOCATION_MACRO(TexCoord13,CG_TEXCOORD13,"TEXCOORD13",3233,0,CG_VARYI
	,cgConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight13,CG_BLENDWEIGHT13,"BLENDWEIGHT13",3041,0	CG_BINDLOCATION_MACRO(TexCoord14,CG_TEXCOORD14,"TEXCOORD14",3234,0,CG_VARYI
	,cgConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight14,CG_BLENDWEIGHT14,"BLENDWEIGHT14",3042,0	CG_BINDLOCATION_MACRO(TexCoord15,CG_TEXCOORD15,"TEXCOORD15",3235,0,CG_VARYI
	,cgConnectorMemberParam)	NG_PARAM)
	CG_BINDLOCATION_MACRO(BlendWeight15,CG_BLENDWEIGHT15,"BLENDWEIGHT15",3043,0	CG_BINDLOCATION_MACRO(CombinerConst0,CG_COMBINER_CONST0,"COMBINER_CONST0",3
	,cgConnectorMemberParam)	284,0,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal0,CG_NORMAL0,"NORMAL0",3092,0,cgConnectorMember	CG_BINDLOCATION_MACRO(CombinerConst1,CG_COMBINER_CONST1,"COMBINER_CONST1",3
	Param)	285,0,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal1,CG_NORMAL1,"NORMAL1",3093,0,cgConnectorMember	CG_BINDLOCATION_MACRO(CombinerStageConst0,CG_COMBINER_STAGE_CONST0,"COMBINE
	Param)	R_STAGE_CONST0",3286,1,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal2,CG_NORMAL2,"NORMAL2",3094,0,cgConnectorMember	CG_BINDLOCATION_MACRO(CombinerStageConst1,CG_COMBINER_STAGE_CONST1,"COMBINE
	Param)	R_STAGE_CONST1",3287,1,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal3,CG_NORMAL3,"NORMAL3",3095,0,cgConnectorMember	CG_BINDLOCATION_MACRO(OffsetTextureMatrix,CG_OFFSET_TEXTURE_MATRIX,"OFFSET_
	Param)	TEXTURE_MATRIX",3288,0,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal4,CG_NORMAL4,"NORMAL4",3096,0,cgConnectorMember	CG_BINDLOCATION_MACRO(OffsetTextureScale,CG_OFFSET_TEXTURE_SCALE,"OFFSET_TE
	Param)	XTURE_SCALE",3289,0,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal5,CG_NORMAL5,"NORMAL5",3097,0,cgConnectorMember	CG_BINDLOCATION_MACRO(OffsetTextureBias,CG_OFFSET_TEXTURE_BIAS,"OFFSET_TEXT
	Param)	URE_BIAS",3290,0,CGI_UNIFORM_PARAM)
	CG_BINDLOCATION_MACRO(Normal6,CG_NORMAL6,"NORMAL6",3098,0,cgConnectorMember	CG_BINDLOCATION_MACRO(ConstEye,CG_CONST_EYE,"CONST_EYE",3291,0,CGI_UNIFORM_
	Param)	PARAM)
	CG_BINDLOCATION_MACRO(Normal7,CG_NORMAL7,"NORMAL7",3099,0,cgConnectorMember	CG_BINDLOCATION_MACRO(TessFactor,CG_TESSFACTOR,"TESSFACTOR",3255,0,CG_VARYI
	Param)	NG_PARAM)
	CG_BINDLOCATION_MACRO(Normal8,CG_NORMAL8,"NORMAL8",3100,0,cgConnectorMember
	Param)
	CG_BINDLOCATION_MACRO(Normal9,CG_NORMAL9,"NORMAL9",3101,0,cgConnectorMember
	Param)
	CG_BINDLOCATION_MACRO(Normal10,CG_NORMAL10,"NORMAL10",3102,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(Normal11,CG_NORMAL11,"NORMAL11",3103,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(Normal12,CG_NORMAL12,"NORMAL12",3104,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(Normal13,CG_NORMAL13,"NORMAL13",3105,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(Normal14,CG_NORMAL14,"NORMAL14",3106,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(Normal15,CG_NORMAL15,"NORMAL15",3107,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(FogCoord,CG_FOGCOORD,"FOGCOORD",3156,0,cgConnectorMem
	berParam)
	CG_BINDLOCATION_MACRO(TexCoord0,CG_TEXCOORD0,"TEXCOORD0",3220,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord1,CG_TEXCOORD1,"TEXCOORD1",3221,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord2,CG_TEXCOORD2,"TEXCOORD2",3222,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord3,CG_TEXCOORD3,"TEXCOORD3",3223,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord4,CG_TEXCOORD4,"TEXCOORD4",3224,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord5,CG_TEXCOORD5,"TEXCOORD5",3225,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord6,CG_TEXCOORD6,"TEXCOORD6",3226,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord7,CG_TEXCOORD7,"TEXCOORD7",3227,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord8,CG_TEXCOORD8,"TEXCOORD8",3228,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord9,CG_TEXCOORD9,"TEXCOORD9",3229,0,cgConnector
	MemberParam)
	CG_BINDLOCATION_MACRO(TexCoord10,CG_TEXCOORD10,"TEXCOORD10",3230,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(TexCoord11,CG_TEXCOORD11,"TEXCOORD11",3231,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(TexCoord12,CG_TEXCOORD12,"TEXCOORD12",3232,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(TexCoord13,CG_TEXCOORD13,"TEXCOORD13",3233,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(TexCoord14,CG_TEXCOORD14,"TEXCOORD14",3234,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(TexCoord15,CG_TEXCOORD15,"TEXCOORD15",3235,0,cgConnec
	torMemberParam)
	CG_BINDLOCATION_MACRO(CombinerConst0,CG_COMBINER_CONST0,"COMBINER_CONST0",3
	284,0,cgUniformParam)
	CG_BINDLOCATION_MACRO(CombinerConst1,CG_COMBINER_CONST1,"COMBINER_CONST1",3
	285,0,cgUniformParam)
	CG_BINDLOCATION_MACRO(CombinerStageConst0,CG_COMBINER_STAGE_CONST0,"COMBINE
	R_STAGE_CONST0",3286,1,cgUniformParam)
	CG_BINDLOCATION_MACRO(CombinerStageConst1,CG_COMBINER_STAGE_CONST1,"COMBINE
	R_STAGE_CONST1",3287,1,cgUniformParam)
	CG_BINDLOCATION_MACRO(OffsetTextureMatrix,CG_OFFSET_TEXTURE_MATRIX,"OFFSET_
	TEXTURE_MATRIX",3288,0,cgUniformParam)
	CG_BINDLOCATION_MACRO(OffsetTextureScale,CG_OFFSET_TEXTURE_SCALE,"OFFSET_TE
	XTURE_SCALE",3289,0,cgUniformParam)
	CG_BINDLOCATION_MACRO(OffsetTextureBias,CG_OFFSET_TEXTURE_BIAS,"OFFSET_TEXT
	URE_BIAS",3290,0,cgUniformParam)
	CG_BINDLOCATION_MACRO(ConstEye,CG_CONST_EYE,"CONST_EYE",3291,0,cgUniformPar
	am)
	CG_BINDLOCATION_MACRO(TessFactor,CG_TESSFACTOR,"TESSFACTOR",3255,0,cgConnec
	torMemberParam)

	#undef CG_BINDLOCATION_MACRO	#undef CG_BINDLOCATION_MACRO

End of changes. 6 change blocks.
	462 lines changed or deleted	388 lines changed or added

	cg_errors.h	cg_errors.h

	skipping to change at line 61	skipping to change at line 61

	/*	/*
	* The following macro invocations define error codes returned by various c g	* The following macro invocations define error codes returned by various c g
	* API functions.	* API functions.
	*	*
	* The macros have the form :	* The macros have the form :
	*	*
	* CG_ERROR_MACRO(code, enum_name, message)	* CG_ERROR_MACRO(code, enum_name, message)
	*	*
	* code : The integer error code associated with the error.	* code : The integer error code associated with the error.

	* enum_name : The name of enumerant of the error code.	* enum_name : The name of enumerant of the error code in the API.
	* (Note : the prefix "cg" will be added to the name).
	* new_enum_name : The name of enumerant of the error code in the new A
	PI.
	* message : A description string associated with the error.	* message : A description string associated with the error.
	*	*
	*/	*/

	CG_ERROR_MACRO(0,	CG_ERROR_MACRO(0,

	NoError,
	CG_NO_ERROR,	CG_NO_ERROR,
	"No error has occurred.")	"No error has occurred.")

	CG_ERROR_MACRO(1,	CG_ERROR_MACRO(1,

	CompileError,
	CG_COMPILER_ERROR,	CG_COMPILER_ERROR,
	"The compile returned an error.")	"The compile returned an error.")

	CG_ERROR_MACRO(2,	CG_ERROR_MACRO(2,

	InvalidParameterError,
	CG_INVALID_PARAMETER_ERROR,	CG_INVALID_PARAMETER_ERROR,
	"The parameter used is invalid.")	"The parameter used is invalid.")

	CG_ERROR_MACRO(3,	CG_ERROR_MACRO(3,

	InvalidProfileError,
	CG_INVALID_PROFILE_ERROR,	CG_INVALID_PROFILE_ERROR,
	"The profile is not supported.")	"The profile is not supported.")

	CG_ERROR_MACRO(4,	CG_ERROR_MACRO(4,

	ProgramLoadError,
	CG_PROGRAM_LOAD_ERROR,	CG_PROGRAM_LOAD_ERROR,
	"The program could not load.")	"The program could not load.")

	CG_ERROR_MACRO(5,	CG_ERROR_MACRO(5,

	ProgramBindError,
	CG_PROGRAM_BIND_ERROR,	CG_PROGRAM_BIND_ERROR,
	"The program could not bind.")	"The program could not bind.")

	CG_ERROR_MACRO(6,	CG_ERROR_MACRO(6,

	ProgramNotLoadedError,
	CG_PROGRAM_NOT_LOADED_ERROR,	CG_PROGRAM_NOT_LOADED_ERROR,
	"The program must be loaded before this operation may be use d.")	"The program must be loaded before this operation may be use d.")

	CG_ERROR_MACRO(7,	CG_ERROR_MACRO(7,

	UnsupportedGLExtensionError,
	CG_UNSUPPORTED_GL_EXTENSION_ERROR,	CG_UNSUPPORTED_GL_EXTENSION_ERROR,
	"An unsupported GL extension was required to perform this op eration.")	"An unsupported GL extension was required to perform this op eration.")

	CG_ERROR_MACRO(8,	CG_ERROR_MACRO(8,

	InvalidValueTypeError,
	CG_INVALID_VALUE_TYPE_ERROR,	CG_INVALID_VALUE_TYPE_ERROR,
	"An unknown value type was assigned to a parameter.")	"An unknown value type was assigned to a parameter.")

	CG_ERROR_MACRO(9,	CG_ERROR_MACRO(9,

	NotMatrixParamError,
	CG_NOT_MATRIX_PARAM_ERROR,	CG_NOT_MATRIX_PARAM_ERROR,
	"The parameter is not of matrix type.")	"The parameter is not of matrix type.")

	CG_ERROR_MACRO(10,	CG_ERROR_MACRO(10,

	InvalidEnumerantError,
	CG_INVALID_ENUMERANT_ERROR,	CG_INVALID_ENUMERANT_ERROR,
	"The enumerant parameter has an invalid value.")	"The enumerant parameter has an invalid value.")

	CG_ERROR_MACRO(11,	CG_ERROR_MACRO(11,

	Not4x4MatrixError,
	CG_NOT_4x4_MATRIX_ERROR,	CG_NOT_4x4_MATRIX_ERROR,
	"The parameter must be a 4x4 matrix type.")	"The parameter must be a 4x4 matrix type.")

	CG_ERROR_MACRO(12,	CG_ERROR_MACRO(12,

	FileReadError,
	CG_FILE_READ_ERROR,	CG_FILE_READ_ERROR,
	"The file could not be read.")	"The file could not be read.")

	CG_ERROR_MACRO(13,	CG_ERROR_MACRO(13,

	FileWriteError,
	CG_FILE_WRITE_ERROR,	CG_FILE_WRITE_ERROR,
	"The file could not be written.")	"The file could not be written.")

	CG_ERROR_MACRO(14,	CG_ERROR_MACRO(14,

	NVParseError,
	CG_NVPARSE_ERROR,	CG_NVPARSE_ERROR,
	"nvparse could not successfully parse the output from the Cg "	"nvparse could not successfully parse the output from the Cg "
	"compiler backend.")	"compiler backend.")

	CG_ERROR_MACRO(15,	CG_ERROR_MACRO(15,

	MemoryAllocError,
	CG_MEMORY_ALLOC_ERROR,	CG_MEMORY_ALLOC_ERROR,
	"Memory allocation failed.")	"Memory allocation failed.")

	CG_ERROR_MACRO(16,	CG_ERROR_MACRO(16,

	InvalidContextHandleError,
	CG_INVALID_CONTEXT_HANDLE_ERROR,	CG_INVALID_CONTEXT_HANDLE_ERROR,
	"Invalid context handle.")	"Invalid context handle.")

	CG_ERROR_MACRO(17,	CG_ERROR_MACRO(17,

	InvalidProgramHandleError,
	CG_INVALID_PROGRAM_HANDLE_ERROR,	CG_INVALID_PROGRAM_HANDLE_ERROR,
	"Invalid program handle.")	"Invalid program handle.")

	CG_ERROR_MACRO(18,	CG_ERROR_MACRO(18,

	InvalidParamHandleError,
	CG_INVALID_PARAM_HANDLE_ERROR,	CG_INVALID_PARAM_HANDLE_ERROR,
	"Invalid parameter handle.")	"Invalid parameter handle.")

	CG_ERROR_MACRO(19,	CG_ERROR_MACRO(19,

	UnknownProfileError,
	CG_UNKNOWN_PROFILE_ERROR,	CG_UNKNOWN_PROFILE_ERROR,
	"The specified profile is unknown.")	"The specified profile is unknown.")

	CG_ERROR_MACRO(20,	CG_ERROR_MACRO(20,

	VarArgError,
	CG_VAR_ARG_ERROR,	CG_VAR_ARG_ERROR,
	"The variable arguments were specified incorrectly.")	"The variable arguments were specified incorrectly.")

	CG_ERROR_MACRO(21,	CG_ERROR_MACRO(21,

	InvalidDimensionError,
	CG_INVALID_DIMENSION_ERROR,	CG_INVALID_DIMENSION_ERROR,
	"The dimension value is invalid.")	"The dimension value is invalid.")

	CG_ERROR_MACRO(22,	CG_ERROR_MACRO(22,

	ArrayParamError,
	CG_ARRAY_PARAM_ERROR,	CG_ARRAY_PARAM_ERROR,
	"The parameter must be an array.")	"The parameter must be an array.")

	CG_ERROR_MACRO(23,	CG_ERROR_MACRO(23,

	OutOfArrayBoundsError,
	CG_OUT_OF_ARRAY_BOUNDS_ERROR,	CG_OUT_OF_ARRAY_BOUNDS_ERROR,
	"Index into the array is out of bounds.")	"Index into the array is out of bounds.")


		CG_ERROR_MACRO(24,
		CG_CONFLICTING_TYPES_ERROR,
		"A type being added to the context conflicts with an "
		"existing type.")

		CG_ERROR_MACRO(25,
		CG_CONFLICTING_PARAMETER_TYPES_ERROR,
		"The parameters being bound have conflicting types.")

		CG_ERROR_MACRO(26,
		CG_PARAMETER_IS_NOT_SHARED_ERROR,
		"The parameter must be global.")

		CG_ERROR_MACRO(27,
		CG_INVALID_PARAMETER_VARIABILITY_ERROR,
		"The parameter could not be changed to the given variability
		.")

		CG_ERROR_MACRO(28,
		CG_CANNOT_DESTROY_PARAMETER_ERROR,
		"Cannot destroy the parameter. It is bound to other paramet
		ers "
		"or is not a root parameter.")

		CG_ERROR_MACRO(29,
		CG_NOT_ROOT_PARAMETER_ERROR,
		"The parameter is not a root parameter.")

		CG_ERROR_MACRO(30,
		CG_PARAMETERS_DO_NOT_MATCH_ERROR,
		"The two parameters being bound do not match.")

		CG_ERROR_MACRO(31,
		CG_IS_NOT_PROGRAM_PARAMETER_ERROR,
		"The parameter is not a program parameter.")

		CG_ERROR_MACRO(32,
		CG_INVALID_PARAMETER_TYPE_ERROR,
		"The type of the parameter is invalid.")

		CG_ERROR_MACRO(33,
		CG_PARAMETER_IS_NOT_RESIZABLE_ARRAY_ERROR,
		"The parameter must be a resizable array.")

		CG_ERROR_MACRO(34,
		CG_INVALID_SIZE_ERROR,
		"The size value is invalid.")

		CG_ERROR_MACRO(35,
		CG_BIND_CREATES_CYCLE_ERROR,
		"Cannot bind the given parameters. Binding will form a cycl
		e.")

		CG_ERROR_MACRO(36,
		CG_ARRAY_TYPES_DO_NOT_MATCH_ERROR,
		"Cannot bind the given parameters. Array types do not match
		.")

		CG_ERROR_MACRO(37,
		CG_ARRAY_DIMENSIONS_DO_NOT_MATCH_ERROR,
		"Cannot bind the given parameters. "
		"Array dimensions do not match.")

		CG_ERROR_MACRO(38,
		CG_ARRAY_HAS_WRONG_DIMENSION_ERROR,
		"The array is has the wrong dimension.")

		CG_ERROR_MACRO(39,
		CG_TYPE_IS_NOT_DEFINED_IN_PROGRAM_ERROR,
		"Connecting the parameters failed because The type of the "
		"source parameter is not defined within the given program "
		"or does not match the type with the same name in the progra
		m.")

	#undef CG_ERROR_MACRO	#undef CG_ERROR_MACRO

End of changes. 26 change blocks.
	28 lines changed or deleted	75 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/

	cg_datatypes.h	cg_datatypes.h

	skipping to change at line 68	skipping to change at line 68
	*	*
	* name : The name of the data type.	* name : The name of the data type.
	* compiler_name : The name of the data type within the compiler syntax .	* compiler_name : The name of the data type within the compiler syntax .
	* enum_name : The C enumerant.	* enum_name : The C enumerant.
	* nrows : Number of rows for matrix types. Should be 0 other- wise.	* nrows : Number of rows for matrix types. Should be 0 other- wise.
	* ncols : Number of columns for matrix types. Should be 0	* ncols : Number of columns for matrix types. Should be 0
	* other-wise.	* other-wise.
	*	*
	*/	*/


	CG_DATATYPE_MACRO(Half,half,CG_HALF,0,0)	CG_DATATYPE_MACRO(Half,half,CG_HALF,0,1)
	CG_DATATYPE_MACRO(Half2,half2,CG_HALF2,0,0)	CG_DATATYPE_MACRO(Half2,half2,CG_HALF2,0,2)
	CG_DATATYPE_MACRO(Half3,half3,CG_HALF3,0,0)	CG_DATATYPE_MACRO(Half3,half3,CG_HALF3,0,3)
	CG_DATATYPE_MACRO(Half4,half4,CG_HALF4,0,0)	CG_DATATYPE_MACRO(Half4,half4,CG_HALF4,0,4)
	CG_DATATYPE_MACRO(Half1x1,half1x1,CG_HALF1x1,1,1)	CG_DATATYPE_MACRO(Half1x1,half1x1,CG_HALF1x1,1,1)
	CG_DATATYPE_MACRO(Half1x2,half1x2,CG_HALF1x2,1,2)	CG_DATATYPE_MACRO(Half1x2,half1x2,CG_HALF1x2,1,2)
	CG_DATATYPE_MACRO(Half1x3,half1x3,CG_HALF1x3,1,3)	CG_DATATYPE_MACRO(Half1x3,half1x3,CG_HALF1x3,1,3)
	CG_DATATYPE_MACRO(Half1x4,half1x4,CG_HALF1x4,1,4)	CG_DATATYPE_MACRO(Half1x4,half1x4,CG_HALF1x4,1,4)
	CG_DATATYPE_MACRO(Half2x1,half2x1,CG_HALF2x1,2,1)	CG_DATATYPE_MACRO(Half2x1,half2x1,CG_HALF2x1,2,1)
	CG_DATATYPE_MACRO(Half2x2,half2x2,CG_HALF2x2,2,2)	CG_DATATYPE_MACRO(Half2x2,half2x2,CG_HALF2x2,2,2)
	CG_DATATYPE_MACRO(Half2x3,half2x3,CG_HALF2x3,2,3)	CG_DATATYPE_MACRO(Half2x3,half2x3,CG_HALF2x3,2,3)
	CG_DATATYPE_MACRO(Half2x4,half2x4,CG_HALF2x4,2,4)	CG_DATATYPE_MACRO(Half2x4,half2x4,CG_HALF2x4,2,4)
	CG_DATATYPE_MACRO(Half3x1,half3x1,CG_HALF3x1,3,1)	CG_DATATYPE_MACRO(Half3x1,half3x1,CG_HALF3x1,3,1)
	CG_DATATYPE_MACRO(Half3x2,half3x2,CG_HALF3x2,3,2)	CG_DATATYPE_MACRO(Half3x2,half3x2,CG_HALF3x2,3,2)
	CG_DATATYPE_MACRO(Half3x3,half3x3,CG_HALF3x3,3,3)	CG_DATATYPE_MACRO(Half3x3,half3x3,CG_HALF3x3,3,3)
	CG_DATATYPE_MACRO(Half3x4,half3x4,CG_HALF3x4,3,4)	CG_DATATYPE_MACRO(Half3x4,half3x4,CG_HALF3x4,3,4)
	CG_DATATYPE_MACRO(Half4x1,half4x1,CG_HALF4x1,4,1)	CG_DATATYPE_MACRO(Half4x1,half4x1,CG_HALF4x1,4,1)
	CG_DATATYPE_MACRO(Half4x2,half4x2,CG_HALF4x2,4,2)	CG_DATATYPE_MACRO(Half4x2,half4x2,CG_HALF4x2,4,2)
	CG_DATATYPE_MACRO(Half4x3,half4x3,CG_HALF4x3,4,3)	CG_DATATYPE_MACRO(Half4x3,half4x3,CG_HALF4x3,4,3)
	CG_DATATYPE_MACRO(Half4x4,half4x4,CG_HALF4x4,4,4)	CG_DATATYPE_MACRO(Half4x4,half4x4,CG_HALF4x4,4,4)

	CG_DATATYPE_MACRO(Float,float,CG_FLOAT,0,0)	CG_DATATYPE_MACRO(Float,float,CG_FLOAT,0,1)
	CG_DATATYPE_MACRO(Float2,float2,CG_FLOAT2,0,0)	CG_DATATYPE_MACRO(Float2,float2,CG_FLOAT2,0,2)
	CG_DATATYPE_MACRO(Float3,float3,CG_FLOAT3,0,0)	CG_DATATYPE_MACRO(Float3,float3,CG_FLOAT3,0,3)
	CG_DATATYPE_MACRO(Float4,float4,CG_FLOAT4,0,0)	CG_DATATYPE_MACRO(Float4,float4,CG_FLOAT4,0,4)
	CG_DATATYPE_MACRO(Float1x1,float1x1,CG_FLOAT1x1,1,1)	CG_DATATYPE_MACRO(Float1x1,float1x1,CG_FLOAT1x1,1,1)
	CG_DATATYPE_MACRO(Float1x2,float1x2,CG_FLOAT1x2,1,2)	CG_DATATYPE_MACRO(Float1x2,float1x2,CG_FLOAT1x2,1,2)
	CG_DATATYPE_MACRO(Float1x3,float1x3,CG_FLOAT1x3,1,3)	CG_DATATYPE_MACRO(Float1x3,float1x3,CG_FLOAT1x3,1,3)
	CG_DATATYPE_MACRO(Float1x4,float1x4,CG_FLOAT1x4,1,4)	CG_DATATYPE_MACRO(Float1x4,float1x4,CG_FLOAT1x4,1,4)
	CG_DATATYPE_MACRO(Float2x1,float2x1,CG_FLOAT2x1,2,1)	CG_DATATYPE_MACRO(Float2x1,float2x1,CG_FLOAT2x1,2,1)
	CG_DATATYPE_MACRO(Float2x2,float2x2,CG_FLOAT2x2,2,2)	CG_DATATYPE_MACRO(Float2x2,float2x2,CG_FLOAT2x2,2,2)
	CG_DATATYPE_MACRO(Float2x3,float2x3,CG_FLOAT2x3,2,3)	CG_DATATYPE_MACRO(Float2x3,float2x3,CG_FLOAT2x3,2,3)
	CG_DATATYPE_MACRO(Float2x4,float2x4,CG_FLOAT2x4,2,4)	CG_DATATYPE_MACRO(Float2x4,float2x4,CG_FLOAT2x4,2,4)
	CG_DATATYPE_MACRO(Float3x1,float3x1,CG_FLOAT3x1,3,1)	CG_DATATYPE_MACRO(Float3x1,float3x1,CG_FLOAT3x1,3,1)
	CG_DATATYPE_MACRO(Float3x2,float3x2,CG_FLOAT3x2,3,2)	CG_DATATYPE_MACRO(Float3x2,float3x2,CG_FLOAT3x2,3,2)

	skipping to change at line 113	skipping to change at line 113
	CG_DATATYPE_MACRO(Float3x4,float3x4,CG_FLOAT3x4,3,4)	CG_DATATYPE_MACRO(Float3x4,float3x4,CG_FLOAT3x4,3,4)
	CG_DATATYPE_MACRO(Float4x1,float4x1,CG_FLOAT4x1,4,1)	CG_DATATYPE_MACRO(Float4x1,float4x1,CG_FLOAT4x1,4,1)
	CG_DATATYPE_MACRO(Float4x2,float4x2,CG_FLOAT4x2,4,2)	CG_DATATYPE_MACRO(Float4x2,float4x2,CG_FLOAT4x2,4,2)
	CG_DATATYPE_MACRO(Float4x3,float4x3,CG_FLOAT4x3,4,3)	CG_DATATYPE_MACRO(Float4x3,float4x3,CG_FLOAT4x3,4,3)
	CG_DATATYPE_MACRO(Float4x4,float4x4,CG_FLOAT4x4,4,4)	CG_DATATYPE_MACRO(Float4x4,float4x4,CG_FLOAT4x4,4,4)
	CG_DATATYPE_MACRO(Sampler1D,sampler1D,CG_SAMPLER1D,0,0)	CG_DATATYPE_MACRO(Sampler1D,sampler1D,CG_SAMPLER1D,0,0)
	CG_DATATYPE_MACRO(Sampler2D,sampler2D,CG_SAMPLER2D,0,0)	CG_DATATYPE_MACRO(Sampler2D,sampler2D,CG_SAMPLER2D,0,0)
	CG_DATATYPE_MACRO(Sampler3D,sampler3D,CG_SAMPLER3D,0,0)	CG_DATATYPE_MACRO(Sampler3D,sampler3D,CG_SAMPLER3D,0,0)
	CG_DATATYPE_MACRO(SamplerRECT,samplerRECT,CG_SAMPLERRECT,0,0)	CG_DATATYPE_MACRO(SamplerRECT,samplerRECT,CG_SAMPLERRECT,0,0)
	CG_DATATYPE_MACRO(SamplerCUBE,samplerCUBE,CG_SAMPLERCUBE,0,0)	CG_DATATYPE_MACRO(SamplerCUBE,samplerCUBE,CG_SAMPLERCUBE,0,0)

	CG_DATATYPE_MACRO(Fixed,fixed,CG_FIXED,0,0)	CG_DATATYPE_MACRO(Fixed,fixed,CG_FIXED,0,1)
	CG_DATATYPE_MACRO(Fixed2,fixed2,CG_FIXED2,0,0)	CG_DATATYPE_MACRO(Fixed2,fixed2,CG_FIXED2,0,2)
	CG_DATATYPE_MACRO(Fixed3,fixed3,CG_FIXED3,0,0)	CG_DATATYPE_MACRO(Fixed3,fixed3,CG_FIXED3,0,3)
	CG_DATATYPE_MACRO(Fixed4,fixed4,CG_FIXED4,0,0)	CG_DATATYPE_MACRO(Fixed4,fixed4,CG_FIXED4,0,4)
	CG_DATATYPE_MACRO(Fixed1x1,fixed1x1,CG_FIXED1x1,1,1)	CG_DATATYPE_MACRO(Fixed1x1,fixed1x1,CG_FIXED1x1,1,1)
	CG_DATATYPE_MACRO(Fixed1x2,fixed1x2,CG_FIXED1x2,1,2)	CG_DATATYPE_MACRO(Fixed1x2,fixed1x2,CG_FIXED1x2,1,2)
	CG_DATATYPE_MACRO(Fixed1x3,fixed1x3,CG_FIXED1x3,1,3)	CG_DATATYPE_MACRO(Fixed1x3,fixed1x3,CG_FIXED1x3,1,3)
	CG_DATATYPE_MACRO(Fixed1x4,fixed1x4,CG_FIXED1x4,1,4)	CG_DATATYPE_MACRO(Fixed1x4,fixed1x4,CG_FIXED1x4,1,4)
	CG_DATATYPE_MACRO(Fixed2x1,fixed2x1,CG_FIXED2x1,2,1)	CG_DATATYPE_MACRO(Fixed2x1,fixed2x1,CG_FIXED2x1,2,1)
	CG_DATATYPE_MACRO(Fixed2x2,fixed2x2,CG_FIXED2x2,2,2)	CG_DATATYPE_MACRO(Fixed2x2,fixed2x2,CG_FIXED2x2,2,2)
	CG_DATATYPE_MACRO(Fixed2x3,fixed2x3,CG_FIXED2x3,2,3)	CG_DATATYPE_MACRO(Fixed2x3,fixed2x3,CG_FIXED2x3,2,3)
	CG_DATATYPE_MACRO(Fixed2x4,fixed2x4,CG_FIXED2x4,2,4)	CG_DATATYPE_MACRO(Fixed2x4,fixed2x4,CG_FIXED2x4,2,4)
	CG_DATATYPE_MACRO(Fixed3x1,fixed3x1,CG_FIXED3x1,3,1)	CG_DATATYPE_MACRO(Fixed3x1,fixed3x1,CG_FIXED3x1,3,1)
	CG_DATATYPE_MACRO(Fixed3x2,fixed3x2,CG_FIXED3x2,3,2)	CG_DATATYPE_MACRO(Fixed3x2,fixed3x2,CG_FIXED3x2,3,2)
	CG_DATATYPE_MACRO(Fixed3x3,fixed3x3,CG_FIXED3x3,3,3)	CG_DATATYPE_MACRO(Fixed3x3,fixed3x3,CG_FIXED3x3,3,3)
	CG_DATATYPE_MACRO(Fixed3x4,fixed3x4,CG_FIXED3x4,3,4)	CG_DATATYPE_MACRO(Fixed3x4,fixed3x4,CG_FIXED3x4,3,4)
	CG_DATATYPE_MACRO(Fixed4x1,fixed4x1,CG_FIXED4x1,4,1)	CG_DATATYPE_MACRO(Fixed4x1,fixed4x1,CG_FIXED4x1,4,1)
	CG_DATATYPE_MACRO(Fixed4x2,fixed4x2,CG_FIXED4x2,4,2)	CG_DATATYPE_MACRO(Fixed4x2,fixed4x2,CG_FIXED4x2,4,2)
	CG_DATATYPE_MACRO(Fixed4x3,fixed4x3,CG_FIXED4x3,4,3)	CG_DATATYPE_MACRO(Fixed4x3,fixed4x3,CG_FIXED4x3,4,3)
	CG_DATATYPE_MACRO(Fixed4x4,fixed4x4,CG_FIXED4x4,4,4)	CG_DATATYPE_MACRO(Fixed4x4,fixed4x4,CG_FIXED4x4,4,4)

	CG_DATATYPE_MACRO(Half1,half1,CG_HALF1,0,0)	CG_DATATYPE_MACRO(Half1,half1,CG_HALF1,0,1)
	CG_DATATYPE_MACRO(Float1,float1,CG_FLOAT1,0,0)	CG_DATATYPE_MACRO(Float1,float1,CG_FLOAT1,0,1)
	CG_DATATYPE_MACRO(Fixed1,fixed1,CG_FIXED1,0,0)	CG_DATATYPE_MACRO(Fixed1,fixed1,CG_FIXED1,0,1)
	CG_DATATYPE_MACRO(Int,int,CG_INT,0,0)	CG_DATATYPE_MACRO(Int,int,CG_INT,0,1)
	CG_DATATYPE_MACRO(Int1,int1,CG_INT1,0,0)	CG_DATATYPE_MACRO(Int1,int1,CG_INT1,0,1)
	CG_DATATYPE_MACRO(Int2,int2,CG_INT2,0,0)	CG_DATATYPE_MACRO(Int2,int2,CG_INT2,0,2)
	CG_DATATYPE_MACRO(Int3,int3,CG_INT3,0,0)	CG_DATATYPE_MACRO(Int3,int3,CG_INT3,0,3)
	CG_DATATYPE_MACRO(Int4,int4,CG_INT4,0,0)	CG_DATATYPE_MACRO(Int4,int4,CG_INT4,0,4)
	CG_DATATYPE_MACRO(Int1x1,int1x1,CG_INT1x1,1,1)	CG_DATATYPE_MACRO(Int1x1,int1x1,CG_INT1x1,1,1)
	CG_DATATYPE_MACRO(Int1x2,int1x2,CG_INT1x2,1,2)	CG_DATATYPE_MACRO(Int1x2,int1x2,CG_INT1x2,1,2)
	CG_DATATYPE_MACRO(Int1x3,int1x3,CG_INT1x3,1,3)	CG_DATATYPE_MACRO(Int1x3,int1x3,CG_INT1x3,1,3)
	CG_DATATYPE_MACRO(Int1x4,int1x4,CG_INT1x4,1,4)	CG_DATATYPE_MACRO(Int1x4,int1x4,CG_INT1x4,1,4)
	CG_DATATYPE_MACRO(Int2x1,int2x1,CG_INT2x1,2,1)	CG_DATATYPE_MACRO(Int2x1,int2x1,CG_INT2x1,2,1)
	CG_DATATYPE_MACRO(Int2x2,int2x2,CG_INT2x2,2,2)	CG_DATATYPE_MACRO(Int2x2,int2x2,CG_INT2x2,2,2)
	CG_DATATYPE_MACRO(Int2x3,int2x3,CG_INT2x3,2,3)	CG_DATATYPE_MACRO(Int2x3,int2x3,CG_INT2x3,2,3)
	CG_DATATYPE_MACRO(Int2x4,int2x4,CG_INT2x4,2,4)	CG_DATATYPE_MACRO(Int2x4,int2x4,CG_INT2x4,2,4)
	CG_DATATYPE_MACRO(Int3x1,int3x1,CG_INT3x1,3,1)	CG_DATATYPE_MACRO(Int3x1,int3x1,CG_INT3x1,3,1)
	CG_DATATYPE_MACRO(Int3x2,int3x2,CG_INT3x2,3,2)	CG_DATATYPE_MACRO(Int3x2,int3x2,CG_INT3x2,3,2)
	CG_DATATYPE_MACRO(Int3x3,int3x3,CG_INT3x3,3,3)	CG_DATATYPE_MACRO(Int3x3,int3x3,CG_INT3x3,3,3)
	CG_DATATYPE_MACRO(Int3x4,int3x4,CG_INT3x4,3,4)	CG_DATATYPE_MACRO(Int3x4,int3x4,CG_INT3x4,3,4)
	CG_DATATYPE_MACRO(Int4x1,int4x1,CG_INT4x1,4,1)	CG_DATATYPE_MACRO(Int4x1,int4x1,CG_INT4x1,4,1)
	CG_DATATYPE_MACRO(Int4x2,int4x2,CG_INT4x2,4,2)	CG_DATATYPE_MACRO(Int4x2,int4x2,CG_INT4x2,4,2)
	CG_DATATYPE_MACRO(Int4x3,int4x3,CG_INT4x3,4,3)	CG_DATATYPE_MACRO(Int4x3,int4x3,CG_INT4x3,4,3)
	CG_DATATYPE_MACRO(Int4x4,int4x4,CG_INT4x4,4,4)	CG_DATATYPE_MACRO(Int4x4,int4x4,CG_INT4x4,4,4)

	CG_DATATYPE_MACRO(Bool,bool,CG_BOOL,0,0)	CG_DATATYPE_MACRO(Bool,bool,CG_BOOL,0,1)
	CG_DATATYPE_MACRO(Bool1,bool1,CG_BOOL1,0,0)	CG_DATATYPE_MACRO(Bool1,bool1,CG_BOOL1,0,1)
	CG_DATATYPE_MACRO(Bool2,bool2,CG_BOOL2,0,0)	CG_DATATYPE_MACRO(Bool2,bool2,CG_BOOL2,0,2)
	CG_DATATYPE_MACRO(Bool3,bool3,CG_BOOL3,0,0)	CG_DATATYPE_MACRO(Bool3,bool3,CG_BOOL3,0,3)
	CG_DATATYPE_MACRO(Bool4,bool4,CG_BOOL4,0,0)	CG_DATATYPE_MACRO(Bool4,bool4,CG_BOOL4,0,4)
	CG_DATATYPE_MACRO(Bool1x1,bool1x1,CG_BOOL1x1,1,1)	CG_DATATYPE_MACRO(Bool1x1,bool1x1,CG_BOOL1x1,1,1)
	CG_DATATYPE_MACRO(Bool1x2,bool1x2,CG_BOOL1x2,1,2)	CG_DATATYPE_MACRO(Bool1x2,bool1x2,CG_BOOL1x2,1,2)
	CG_DATATYPE_MACRO(Bool1x3,bool1x3,CG_BOOL1x3,1,3)	CG_DATATYPE_MACRO(Bool1x3,bool1x3,CG_BOOL1x3,1,3)
	CG_DATATYPE_MACRO(Bool1x4,bool1x4,CG_BOOL1x4,1,4)	CG_DATATYPE_MACRO(Bool1x4,bool1x4,CG_BOOL1x4,1,4)
	CG_DATATYPE_MACRO(Bool2x1,bool2x1,CG_BOOL2x1,2,1)	CG_DATATYPE_MACRO(Bool2x1,bool2x1,CG_BOOL2x1,2,1)
	CG_DATATYPE_MACRO(Bool2x2,bool2x2,CG_BOOL2x2,2,2)	CG_DATATYPE_MACRO(Bool2x2,bool2x2,CG_BOOL2x2,2,2)
	CG_DATATYPE_MACRO(Bool2x3,bool2x3,CG_BOOL2x3,2,3)	CG_DATATYPE_MACRO(Bool2x3,bool2x3,CG_BOOL2x3,2,3)
	CG_DATATYPE_MACRO(Bool2x4,bool2x4,CG_BOOL2x4,2,4)	CG_DATATYPE_MACRO(Bool2x4,bool2x4,CG_BOOL2x4,2,4)
	CG_DATATYPE_MACRO(Bool3x1,bool3x1,CG_BOOL3x1,3,1)	CG_DATATYPE_MACRO(Bool3x1,bool3x1,CG_BOOL3x1,3,1)
	CG_DATATYPE_MACRO(Bool3x2,bool3x2,CG_BOOL3x2,3,2)	CG_DATATYPE_MACRO(Bool3x2,bool3x2,CG_BOOL3x2,3,2)

End of changes. 5 change blocks.
	25 lines changed or deleted	25 lines changed or added