cg: headers diff between 1.2.1 and 1.4.1 versions

	cg.h	cg.h
	/*	/*
	*	*

	* Copyright (c) 2002, NVIDIA Corporation.	* Copyright (c) 2002-2004, NVIDIA Corporation.
	*	*
	*	*
	*	*
	* NVIDIA Corporation("NVIDIA") supplies this software to you in considerat ion	* NVIDIA Corporation("NVIDIA") supplies this software to you in considerat ion
	* of your agreement to the following terms, and your use, installation,	* of your agreement to the following terms, and your use, installation,
	* modification or redistribution of this NVIDIA software constitutes	* modification or redistribution of this NVIDIA software constitutes
	* acceptance of these terms. If you do not agree with these terms, please do	* acceptance of these terms. If you do not agree with these terms, please do
	* not use, install, modify or redistribute this NVIDIA software.	* not use, install, modify or redistribute this NVIDIA software.
	*	*
	*	*

	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


	#define CG_VERSION_1_2 1	#define CG_VERSION_NUM 1400
	#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 95	skipping to change at line 88
	/*************************************************************************/	/*************************************************************************/

	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;

		typedef struct _CGeffect *CGeffect;
		typedef struct _CGtechnique *CGtechnique;
		typedef struct _CGpass *CGpass;
		typedef struct _CGstate *CGstate;
		typedef struct _CGstateassignment *CGstateassignment;
		typedef struct _CGannotation *CGannotation;
		typedef void *CGhandle;

		typedef CGbool (*CGstatecallback)(CGstateassignment);

	//!!! PREPROCESS BEGIN	//!!! 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, base_name, ncols , nrows, pc) \
	enum_name ,	enum_name ,

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

	} 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) \

	skipping to change at line 144	skipping to change at line 146
	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>
	} CGerror;	} CGerror;


		typedef enum
		{
		CG_PARAMETERCLASS_UNKNOWN = 0,
		CG_PARAMETERCLASS_SCALAR,
		CG_PARAMETERCLASS_VECTOR,
		CG_PARAMETERCLASS_MATRIX,
		CG_PARAMETERCLASS_STRUCT,
		CG_PARAMETERCLASS_ARRAY,
		CG_PARAMETERCLASS_SAMPLER,
		CG_PARAMETERCLASS_OBJECT
		} CGparameterclass;

	//!!! PREPROCESS END	//!!! PREPROCESS END

	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>
	} 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);

		typedef void (CGerrorHandlerFunc)(CGcontext ctx, CGerror err, void data);

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

	#ifndef CG_EXPLICIT	#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 cgSetLastListing(CGhandle handle, const char *listing);
	CGDLL_API void cgSetAutoCompile(CGcontext ctx, CGenum flag);	CGDLL_API void cgSetAutoCompile(CGcontext ctx, CGenum flag);

		CGDLL_API CGenum cgGetAutoCompile(CGcontext ctx);

	/* 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,
	const char *program_file,	const char *program_file,
	CGprofile profile,	CGprofile profile,
	const char *entry,	const char *entry,
	const char **args);	const char **args);
	CGDLL_API CGprogram cgCopyProgram(CGprogram program);	CGDLL_API CGprogram cgCopyProgram(CGprogram program);
	CGDLL_API void cgDestroyProgram(CGprogram program);	CGDLL_API void cgDestroyProgram(CGprogram program);

	CGDLL_API CGprogram cgGetFirstProgram(CGcontext ctx);	CGDLL_API CGprogram cgGetFirstProgram(CGcontext ctx);
	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);

		CGDLL_API char const * const *cgGetProgramOptions(CGprogram prog);
		CGDLL_API void cgSetProgramProfile(CGprogram prog, CGprofile profile);

		CGDLL_API void cgSetPassProgramParameters(CGprogram);

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

	CGDLL_API CGparameter cgCreateParameter(CGcontext ctx, CGtype type);	CGDLL_API CGparameter cgCreateParameter(CGcontext ctx, CGtype type);
	CGDLL_API CGparameter cgCreateParameterArray(CGcontext ctx,	CGDLL_API CGparameter cgCreateParameterArray(CGcontext ctx,
	CGtype type,	CGtype type,
	int length);	int length);
	CGDLL_API CGparameter cgCreateParameterMultiDimArray(CGcontext ctx,	CGDLL_API CGparameter cgCreateParameterMultiDimArray(CGcontext ctx,
	CGtype type,	CGtype type,
	int dim,	int dim,

	skipping to change at line 239	skipping to change at line 260
	CGDLL_API CGparameter cgGetFirstStructParameter(CGparameter param);	CGDLL_API CGparameter cgGetFirstStructParameter(CGparameter param);
	CGDLL_API CGparameter cgGetNamedStructParameter(CGparameter param,	CGDLL_API CGparameter cgGetNamedStructParameter(CGparameter param,
	const char *name);	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 CGtype cgGetArrayType(CGparameter param);
	CGDLL_API int cgGetArraySize(CGparameter param, int dimension);	CGDLL_API int cgGetArraySize(CGparameter param, int dimension);

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

	CGDLL_API CGprogram cgGetParameterProgram(CGparameter param);	CGDLL_API CGprogram cgGetParameterProgram(CGparameter param);
	CGDLL_API CGcontext cgGetParameterContext(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 cgGetParameterBaseType(CGparameter param);
		CGDLL_API CGparameterclass cgGetParameterClass(CGparameter param);
		CGDLL_API int cgGetParameterRows(CGparameter param);
		CGDLL_API int cgGetParameterColumns(CGparameter param);
	CGDLL_API CGtype cgGetParameterNamedType(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 CGbool cgIsParameterUsed(CGparameter param, CGhandle handle);
	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 void cgSetParameterValuedr(CGparameter param, int n, const double
		*vals);
		CGDLL_API void cgSetParameterValuedc(CGparameter param, int n, const double
		*vals);
		CGDLL_API void cgSetParameterValuefr(CGparameter param, int n, const float
		*vals);
		CGDLL_API void cgSetParameterValuefc(CGparameter param, int n, const float
		*vals);
		CGDLL_API void cgSetParameterValueir(CGparameter param, int n, const int *v
		als);
		CGDLL_API void cgSetParameterValueic(CGparameter param, int n, const int *v
		als);
		CGDLL_API int cgGetParameterValuedr(CGparameter param, int n, double *vals)
		;
		CGDLL_API int cgGetParameterValuedc(CGparameter param, int n, double *vals)
		;
		CGDLL_API int cgGetParameterValuefr(CGparameter param, int n, float *vals);
		CGDLL_API int cgGetParameterValuefc(CGparameter param, int n, float *vals);
		CGDLL_API int cgGetParameterValueir(CGparameter param, int n, int *vals);
		CGDLL_API int cgGetParameterValueic(CGparameter param, int n, int *vals);
		CGDLL_API const char *cgGetStringParameterValue(CGparameter param);
		CGDLL_API void cgSetStringParameterValue(CGparameter param, const char *str
		);

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

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

	CGDLL_API void cgSetParameter1f(CGparameter param, float x);	CGDLL_API void cgSetParameter1f(CGparameter param, float x);
	CGDLL_API void cgSetParameter2f(CGparameter param, float x, float y);	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 cgSetParameter3f(CGparameter param, float x, float y, float z);

	skipping to change at line 284	skipping to change at line 326
	CGDLL_API void cgSetParameter2d(CGparameter param, double x, double y);	CGDLL_API void cgSetParameter2d(CGparameter param, double x, double y);
	CGDLL_API void cgSetParameter3d(CGparameter param,	CGDLL_API void cgSetParameter3d(CGparameter param,
	double x,	double x,
	double y,	double y,
	double z);	double z);
	CGDLL_API void cgSetParameter4d(CGparameter param,	CGDLL_API void cgSetParameter4d(CGparameter param,
	double x,	double x,
	double y,	double y,
	double z,	double z,
	double w);	double w);

		CGDLL_API void cgSetParameter1i(CGparameter param, int x);
		CGDLL_API void cgSetParameter2i(CGparameter param, int x, int y);
		CGDLL_API void cgSetParameter3i(CGparameter param, int x, int y, int z);
		CGDLL_API void cgSetParameter4i(CGparameter param,
		int x,
		int y,
		int z,
		int w);


		CGDLL_API void cgSetParameter1iv(CGparameter param, const int *v);
		CGDLL_API void cgSetParameter2iv(CGparameter param, const int *v);
		CGDLL_API void cgSetParameter3iv(CGparameter param, const int *v);
		CGDLL_API void cgSetParameter4iv(CGparameter param, const int *v);
	CGDLL_API void cgSetParameter1fv(CGparameter param, const float *v);	CGDLL_API void cgSetParameter1fv(CGparameter param, const float *v);
	CGDLL_API void cgSetParameter2fv(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 cgSetParameter3fv(CGparameter param, const float *v);
	CGDLL_API void cgSetParameter4fv(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 cgSetParameter1dv(CGparameter param, const double *v);
	CGDLL_API void cgSetParameter2dv(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 cgSetParameter3dv(CGparameter param, const double *v);
	CGDLL_API void cgSetParameter4dv(CGparameter param, const double *v);	CGDLL_API void cgSetParameter4dv(CGparameter param, const double *v);


		CGDLL_API void cgSetMatrixParameterir(CGparameter param, const int *matrix) ;
	CGDLL_API void cgSetMatrixParameterdr(CGparameter param, const double *matr ix);	CGDLL_API void cgSetMatrixParameterdr(CGparameter param, const double *matr ix);
	CGDLL_API void cgSetMatrixParameterfr(CGparameter param, const float *matri x);	CGDLL_API void cgSetMatrixParameterfr(CGparameter param, const float *matri x);

		CGDLL_API void cgSetMatrixParameteric(CGparameter param, const int *matrix) ;
	CGDLL_API void cgSetMatrixParameterdc(CGparameter param, const double *matr ix);	CGDLL_API void cgSetMatrixParameterdc(CGparameter param, const double *matr ix);
	CGDLL_API void cgSetMatrixParameterfc(CGparameter param, const float *matri x);	CGDLL_API void cgSetMatrixParameterfc(CGparameter param, const float *matri x);


		CGDLL_API void cgGetMatrixParameterir(CGparameter param, int *matrix);
		CGDLL_API void cgGetMatrixParameterdr(CGparameter param, double *matrix);
		CGDLL_API void cgGetMatrixParameterfr(CGparameter param, float *matrix);
		CGDLL_API void cgGetMatrixParameteric(CGparameter param, int *matrix);
		CGDLL_API void cgGetMatrixParameterdc(CGparameter param, double *matrix);
		CGDLL_API void cgGetMatrixParameterfc(CGparameter param, float *matrix);

	/* 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 CGtype cgGetNamedUserType(CGhandle handle, const char *name);


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

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

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

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

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

	skipping to change at line 333	skipping to change at line 396
	CGDLL_API CGenum cgGetEnum(const char *enum_string);	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 CGerror cgGetFirstError(void);
	CGDLL_API const char *cgGetErrorString(CGerror error);	CGDLL_API const char *cgGetErrorString(CGerror error);
	CGDLL_API const char cgGetLastErrorString(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);

		CGDLL_API void cgSetErrorHandler(CGerrorHandlerFunc func, void *data);
		CGDLL_API CGerrorHandlerFunc cgGetErrorHandler(void **data);

	/* Misc Functions */	/* Misc Functions */

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


	/* Support for deprecated Cg 1.1 API */	/* CgFX Functions */


	CGDLL_API CGparameter cgGetNextParameter_depr1_1(CGparameter current);	CGDLL_API CGeffect cgCreateEffect(CGcontext, const char code, const char
	CGDLL_API CGparameter cgGetNextLeafParameter_depr1_1(CGparameter current);	*args);
		CGDLL_API CGeffect cgCreateEffectFromFile(CGcontext, const char *filename,
		const char **args);
		CGDLL_API void cgDestroyEffect(CGeffect);
		CGDLL_API CGcontext cgGetEffectContext(CGeffect);
		CGDLL_API CGbool cgIsEffect(CGeffect effect);


	#ifdef CG_DEPRECATED_1_1_API	CGDLL_API CGeffect cgGetFirstEffect(CGcontext);
		CGDLL_API CGeffect cgGetNextEffect(CGeffect);


	#define cgGetNextParameter cgGetNextParameter_depr1_1	CGDLL_API CGprogram cgCreateProgramFromEffect(CGeffect effect,
	#define cgGetNextLeafParameter cgGetNextLeafParameter_depr1_1	CGprofile profile,
		const char *entry,
		const char **args);


	#endif	CGDLL_API CGtechnique cgGetFirstTechnique(CGeffect);
		CGDLL_API CGtechnique cgGetNextTechnique(CGtechnique);
		CGDLL_API CGtechnique cgGetNamedTechnique(CGeffect, const char *name);
		CGDLL_API const char *cgGetTechniqueName(CGtechnique);
		CGDLL_API CGbool cgIsTechnique(CGtechnique);
		CGDLL_API CGbool cgValidateTechnique(CGtechnique);
		CGDLL_API CGbool cgIsTechniqueValidated(CGtechnique);
		CGDLL_API CGeffect cgGetTechniqueEffect(CGtechnique);

		CGDLL_API CGpass cgGetFirstPass(CGtechnique);
		CGDLL_API CGpass cgGetNamedPass(CGtechnique, const char *name);
		CGDLL_API CGpass cgGetNextPass(CGpass);
		CGDLL_API CGbool cgIsPass(CGpass);
		CGDLL_API const char *cgGetPassName(CGpass);
		CGDLL_API CGtechnique cgGetPassTechnique(CGpass);

		CGDLL_API void cgSetPassState(CGpass);
		CGDLL_API void cgResetPassState(CGpass);

		CGDLL_API CGstateassignment cgGetFirstStateAssignment(CGpass);
		CGDLL_API CGstateassignment cgGetNamedStateAssignment(CGpass, const char *n
		ame);
		CGDLL_API CGstateassignment cgGetNextStateAssignment(CGstateassignment);
		CGDLL_API CGbool cgIsStateAssignment(CGstateassignment);
		CGDLL_API CGbool cgCallStateSetCallback(CGstateassignment);
		CGDLL_API CGbool cgCallStateValidateCallback(CGstateassignment);
		CGDLL_API CGbool cgCallStateResetCallback(CGstateassignment);
		CGDLL_API CGpass cgGetStateAssignmentPass(CGstateassignment);
		CGDLL_API CGparameter cgGetSamplerStateAssignmentParameter(CGstateassignmen
		t);

		CGDLL_API const float *cgGetFloatStateAssignmentValues(CGstateassignment, i
		nt *nVals);
		CGDLL_API const int cgGetIntStateAssignmentValues(CGstateassignment, int
		nVals);
		CGDLL_API const CGbool *cgGetBoolStateAssignmentValues(CGstateassignment, i
		nt *nVals);
		CGDLL_API const char *cgGetStringStateAssignmentValue(CGstateassignment);
		CGDLL_API CGprogram cgGetProgramStateAssignmentValue(CGstateassignment);
		CGDLL_API CGparameter cgGetTextureStateAssignmentValue(CGstateassignment);
		CGDLL_API CGparameter cgGetSamplerStateAssignmentValue(CGstateassignment);
		CGDLL_API int cgGetStateAssignmentIndex(CGstateassignment);

		CGDLL_API int cgGetNumDependentStateAssignmentParameters(CGstateassignment)
		;
		CGDLL_API CGparameter cgGetDependentStateAssignmentParameter(CGstateassignm
		ent, int index);

		CGDLL_API CGstate cgGetStateAssignmentState(CGstateassignment);
		CGDLL_API CGstate cgGetSamplerStateAssignmentState(CGstateassignment);

		CGDLL_API CGstate cgCreateState(CGcontext, const char *name, CGtype);
		CGDLL_API CGstate cgCreateArrayState(CGcontext, const char *name, CGtype, i
		nt nelems);
		CGDLL_API void cgSetStateCallbacks(CGstate, CGstatecallback set, CGstatecal
		lback reset,
		CGstatecallback validate);
		CGDLL_API CGstatecallback cgGetStateSetCallback(CGstate);
		CGDLL_API CGstatecallback cgGetStateResetCallback(CGstate);
		CGDLL_API CGstatecallback cgGetStateValidateCallback(CGstate);
		CGDLL_API CGtype cgGetStateType(CGstate);
		CGDLL_API const char *cgGetStateName(CGstate);
		CGDLL_API CGstate cgGetNamedState(CGcontext, const char *name);
		CGDLL_API CGstate cgGetFirstState(CGcontext);
		CGDLL_API CGstate cgGetNextState(CGstate);
		CGDLL_API CGbool cgIsState(CGstate);
		CGDLL_API void cgAddStateEnumerant(CGstate, const char *name, int value);

		CGDLL_API CGstate cgCreateSamplerState(CGcontext, const char *name, CGtype)
		;
		CGDLL_API CGstate cgCreateArraySamplerState(CGcontext, const char *name, CG
		type, int nelems);
		CGDLL_API CGstate cgGetNamedSamplerState(CGcontext, const char *name);
		CGDLL_API CGstate cgGetFirstSamplerState(CGcontext);

		CGDLL_API CGstateassignment cgGetFirstSamplerStateAssignment(CGparameter);
		CGDLL_API CGstateassignment cgGetNamedSamplerStateAssignment(CGparameter, c
		onst char *);
		CGDLL_API void cgSetSamplerState(CGparameter);

		CGDLL_API CGparameter cgGetNamedEffectParameter(CGeffect, const char *);
		CGDLL_API CGparameter cgGetFirstLeafEffectParameter(CGeffect);
		CGDLL_API CGparameter cgGetFirstEffectParameter(CGeffect);
		CGDLL_API CGparameter cgGetEffectParameterBySemantic(CGeffect, const char *
		);

		CGDLL_API CGannotation cgGetFirstTechniqueAnnotation(CGtechnique);
		CGDLL_API CGannotation cgGetFirstPassAnnotation(CGpass);
		CGDLL_API CGannotation cgGetFirstParameterAnnotation(CGparameter);
		CGDLL_API CGannotation cgGetFirstProgramAnnotation(CGprogram);
		CGDLL_API CGannotation cgGetNextAnnotation(CGannotation);

		CGDLL_API CGannotation cgGetNamedTechniqueAnnotation(CGtechnique, const cha
		r *);
		CGDLL_API CGannotation cgGetNamedPassAnnotation(CGpass, const char *);
		CGDLL_API CGannotation cgGetNamedParameterAnnotation(CGparameter, const cha
		r *);
		CGDLL_API CGannotation cgGetNamedProgramAnnotation(CGprogram, const char *)
		;

		CGDLL_API CGbool cgIsAnnotation(CGannotation);

		CGDLL_API const char *cgGetAnnotationName(CGannotation);
		CGDLL_API CGtype cgGetAnnotationType(CGannotation);

		CGDLL_API const float cgGetFloatAnnotationValues(CGannotation, int nvalue
		s);
		CGDLL_API const int cgGetIntAnnotationValues(CGannotation, int nvalues);
		CGDLL_API const char *cgGetStringAnnotationValue(CGannotation);
		CGDLL_API const int cgGetBooleanAnnotationValues(CGannotation, int nvalue
		s);

		CGDLL_API int cgGetNumDependentAnnotationParameters(CGannotation);
		CGDLL_API CGparameter cgGetDependentAnnotationParameter(CGannotation, int i
		ndex);

		CGDLL_API void cgEvaluateProgram(CGprogram, float *, int ncomps, int nx, in
		t ny, int nz);

	#endif	#endif

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

	#endif	#endif

End of changes. 28 change blocks.
	26 lines changed or deleted	225 lines changed or added

	cgGL.h	cgGL.h

	skipping to change at line 362	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 void cgGLSetManageTextureParameters(CGcontext ctx, CGbool flag) ;
	CGGLDLL_API CGbool cgGLGetManageTextureParameters(CGcontext ctx);	CGGLDLL_API CGbool cgGLGetManageTextureParameters(CGcontext ctx);


		CGGLDLL_API void cgGLSetupSampler(CGparameter param, GLuint texobj);
		CGGLDLL_API void cgGLRegisterStates(CGcontext);

	#endif	#endif

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

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	cgGL_profiles.h	cgGL_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.
	*	*
	*/	*/

	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(ARBFragment,arbfp1,ARBFP1,"arbfp1",7000,0)	CG_PROFILE_MACRO(ARBFragment,arbfp1,ARBFP1,"arbfp1",7000,0)

		CG_PROFILE_MACRO(Vertex40,vp40,VP40,"vp40",7001,1)

	#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	2 lines changed or added

	cg_datatypes.h	cg_datatypes.h

	skipping to change at line 63	skipping to change at line 63
	* The following macro invocations define the supported CG basic data types .	* The following macro invocations define the supported CG basic data types .
	*	*
	* The macros have the form :	* The macros have the form :
	*	*
	* CG_DATATYPE_MACRO(name, compiler_name, nrows, ncols)	* CG_DATATYPE_MACRO(name, compiler_name, nrows, ncols)
	*	*
	* 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 scalar, vector, and matrix typ
	* other-wise.	es.
	*	*
	*/	*/


	CG_DATATYPE_MACRO(Half,half,CG_HALF,0,1)	CG_DATATYPE_MACRO(Half,half,CG_HALF,CG_HALF,0,1,CG_PARAMETERCLASS_SCALAR)
	CG_DATATYPE_MACRO(Half2,half2,CG_HALF2,0,2)	CG_DATATYPE_MACRO(Half2,half2,CG_HALF2,CG_HALF,0,2,CG_PARAMETERCLASS_VECTOR
	CG_DATATYPE_MACRO(Half3,half3,CG_HALF3,0,3)	)
	CG_DATATYPE_MACRO(Half4,half4,CG_HALF4,0,4)	CG_DATATYPE_MACRO(Half3,half3,CG_HALF3,CG_HALF,0,3,CG_PARAMETERCLASS_VECTOR
	CG_DATATYPE_MACRO(Half1x1,half1x1,CG_HALF1x1,1,1)	)
	CG_DATATYPE_MACRO(Half1x2,half1x2,CG_HALF1x2,1,2)	CG_DATATYPE_MACRO(Half4,half4,CG_HALF4,CG_HALF,0,4,CG_PARAMETERCLASS_VECTOR
	CG_DATATYPE_MACRO(Half1x3,half1x3,CG_HALF1x3,1,3)	)
	CG_DATATYPE_MACRO(Half1x4,half1x4,CG_HALF1x4,1,4)	CG_DATATYPE_MACRO(Half1x1,half1x1,CG_HALF1x1,CG_HALF,1,1,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half2x1,half2x1,CG_HALF2x1,2,1)	MATRIX)
	CG_DATATYPE_MACRO(Half2x2,half2x2,CG_HALF2x2,2,2)	CG_DATATYPE_MACRO(Half1x2,half1x2,CG_HALF1x2,CG_HALF,1,2,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half2x3,half2x3,CG_HALF2x3,2,3)	MATRIX)
	CG_DATATYPE_MACRO(Half2x4,half2x4,CG_HALF2x4,2,4)	CG_DATATYPE_MACRO(Half1x3,half1x3,CG_HALF1x3,CG_HALF,1,3,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half3x1,half3x1,CG_HALF3x1,3,1)	MATRIX)
	CG_DATATYPE_MACRO(Half3x2,half3x2,CG_HALF3x2,3,2)	CG_DATATYPE_MACRO(Half1x4,half1x4,CG_HALF1x4,CG_HALF,1,4,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half3x3,half3x3,CG_HALF3x3,3,3)	MATRIX)
	CG_DATATYPE_MACRO(Half3x4,half3x4,CG_HALF3x4,3,4)	CG_DATATYPE_MACRO(Half2x1,half2x1,CG_HALF2x1,CG_HALF,2,1,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half4x1,half4x1,CG_HALF4x1,4,1)	MATRIX)
	CG_DATATYPE_MACRO(Half4x2,half4x2,CG_HALF4x2,4,2)	CG_DATATYPE_MACRO(Half2x2,half2x2,CG_HALF2x2,CG_HALF,2,2,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Half4x3,half4x3,CG_HALF4x3,4,3)	MATRIX)
	CG_DATATYPE_MACRO(Half4x4,half4x4,CG_HALF4x4,4,4)	CG_DATATYPE_MACRO(Half2x3,half2x3,CG_HALF2x3,CG_HALF,2,3,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float,float,CG_FLOAT,0,1)	MATRIX)
	CG_DATATYPE_MACRO(Float2,float2,CG_FLOAT2,0,2)	CG_DATATYPE_MACRO(Half2x4,half2x4,CG_HALF2x4,CG_HALF,2,4,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float3,float3,CG_FLOAT3,0,3)	MATRIX)
	CG_DATATYPE_MACRO(Float4,float4,CG_FLOAT4,0,4)	CG_DATATYPE_MACRO(Half3x1,half3x1,CG_HALF3x1,CG_HALF,3,1,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float1x1,float1x1,CG_FLOAT1x1,1,1)	MATRIX)
	CG_DATATYPE_MACRO(Float1x2,float1x2,CG_FLOAT1x2,1,2)	CG_DATATYPE_MACRO(Half3x2,half3x2,CG_HALF3x2,CG_HALF,3,2,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float1x3,float1x3,CG_FLOAT1x3,1,3)	MATRIX)
	CG_DATATYPE_MACRO(Float1x4,float1x4,CG_FLOAT1x4,1,4)	CG_DATATYPE_MACRO(Half3x3,half3x3,CG_HALF3x3,CG_HALF,3,3,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float2x1,float2x1,CG_FLOAT2x1,2,1)	MATRIX)
	CG_DATATYPE_MACRO(Float2x2,float2x2,CG_FLOAT2x2,2,2)	CG_DATATYPE_MACRO(Half3x4,half3x4,CG_HALF3x4,CG_HALF,3,4,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float2x3,float2x3,CG_FLOAT2x3,2,3)	MATRIX)
	CG_DATATYPE_MACRO(Float2x4,float2x4,CG_FLOAT2x4,2,4)	CG_DATATYPE_MACRO(Half4x1,half4x1,CG_HALF4x1,CG_HALF,4,1,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float3x1,float3x1,CG_FLOAT3x1,3,1)	MATRIX)
	CG_DATATYPE_MACRO(Float3x2,float3x2,CG_FLOAT3x2,3,2)	CG_DATATYPE_MACRO(Half4x2,half4x2,CG_HALF4x2,CG_HALF,4,2,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float3x3,float3x3,CG_FLOAT3x3,3,3)	MATRIX)
	CG_DATATYPE_MACRO(Float3x4,float3x4,CG_FLOAT3x4,3,4)	CG_DATATYPE_MACRO(Half4x3,half4x3,CG_HALF4x3,CG_HALF,4,3,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float4x1,float4x1,CG_FLOAT4x1,4,1)	MATRIX)
	CG_DATATYPE_MACRO(Float4x2,float4x2,CG_FLOAT4x2,4,2)	CG_DATATYPE_MACRO(Half4x4,half4x4,CG_HALF4x4,CG_HALF,4,4,CG_PARAMETERCLASS_
	CG_DATATYPE_MACRO(Float4x3,float4x3,CG_FLOAT4x3,4,3)	MATRIX)
	CG_DATATYPE_MACRO(Float4x4,float4x4,CG_FLOAT4x4,4,4)	CG_DATATYPE_MACRO(Float,float,CG_FLOAT,CG_FLOAT,0,1,CG_PARAMETERCLASS_SCALA
	CG_DATATYPE_MACRO(Sampler1D,sampler1D,CG_SAMPLER1D,0,0)	R)
	CG_DATATYPE_MACRO(Sampler2D,sampler2D,CG_SAMPLER2D,0,0)	CG_DATATYPE_MACRO(Float2,float2,CG_FLOAT2,CG_FLOAT,0,2,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(Sampler3D,sampler3D,CG_SAMPLER3D,0,0)	CTOR)
	CG_DATATYPE_MACRO(SamplerRECT,samplerRECT,CG_SAMPLERRECT,0,0)	CG_DATATYPE_MACRO(Float3,float3,CG_FLOAT3,CG_FLOAT,0,3,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(SamplerCUBE,samplerCUBE,CG_SAMPLERCUBE,0,0)	CTOR)
	CG_DATATYPE_MACRO(Fixed,fixed,CG_FIXED,0,1)	CG_DATATYPE_MACRO(Float4,float4,CG_FLOAT4,CG_FLOAT,0,4,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(Fixed2,fixed2,CG_FIXED2,0,2)	CTOR)
	CG_DATATYPE_MACRO(Fixed3,fixed3,CG_FIXED3,0,3)	CG_DATATYPE_MACRO(Float1x1,float1x1,CG_FLOAT1x1,CG_FLOAT,1,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed4,fixed4,CG_FIXED4,0,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed1x1,fixed1x1,CG_FIXED1x1,1,1)	CG_DATATYPE_MACRO(Float1x2,float1x2,CG_FLOAT1x2,CG_FLOAT,1,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed1x2,fixed1x2,CG_FIXED1x2,1,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed1x3,fixed1x3,CG_FIXED1x3,1,3)	CG_DATATYPE_MACRO(Float1x3,float1x3,CG_FLOAT1x3,CG_FLOAT,1,3,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed1x4,fixed1x4,CG_FIXED1x4,1,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed2x1,fixed2x1,CG_FIXED2x1,2,1)	CG_DATATYPE_MACRO(Float1x4,float1x4,CG_FLOAT1x4,CG_FLOAT,1,4,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed2x2,fixed2x2,CG_FIXED2x2,2,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed2x3,fixed2x3,CG_FIXED2x3,2,3)	CG_DATATYPE_MACRO(Float2x1,float2x1,CG_FLOAT2x1,CG_FLOAT,2,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed2x4,fixed2x4,CG_FIXED2x4,2,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed3x1,fixed3x1,CG_FIXED3x1,3,1)	CG_DATATYPE_MACRO(Float2x2,float2x2,CG_FLOAT2x2,CG_FLOAT,2,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed3x2,fixed3x2,CG_FIXED3x2,3,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed3x3,fixed3x3,CG_FIXED3x3,3,3)	CG_DATATYPE_MACRO(Float2x3,float2x3,CG_FLOAT2x3,CG_FLOAT,2,3,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed3x4,fixed3x4,CG_FIXED3x4,3,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed4x1,fixed4x1,CG_FIXED4x1,4,1)	CG_DATATYPE_MACRO(Float2x4,float2x4,CG_FLOAT2x4,CG_FLOAT,2,4,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed4x2,fixed4x2,CG_FIXED4x2,4,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed4x3,fixed4x3,CG_FIXED4x3,4,3)	CG_DATATYPE_MACRO(Float3x1,float3x1,CG_FLOAT3x1,CG_FLOAT,3,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Fixed4x4,fixed4x4,CG_FIXED4x4,4,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Half1,half1,CG_HALF1,0,1)	CG_DATATYPE_MACRO(Float3x2,float3x2,CG_FLOAT3x2,CG_FLOAT,3,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Float1,float1,CG_FLOAT1,0,1)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Fixed1,fixed1,CG_FIXED1,0,1)	CG_DATATYPE_MACRO(Float3x3,float3x3,CG_FLOAT3x3,CG_FLOAT,3,3,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int,int,CG_INT,0,1)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int1,int1,CG_INT1,0,1)	CG_DATATYPE_MACRO(Float3x4,float3x4,CG_FLOAT3x4,CG_FLOAT,3,4,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int2,int2,CG_INT2,0,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int3,int3,CG_INT3,0,3)	CG_DATATYPE_MACRO(Float4x1,float4x1,CG_FLOAT4x1,CG_FLOAT,4,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int4,int4,CG_INT4,0,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int1x1,int1x1,CG_INT1x1,1,1)	CG_DATATYPE_MACRO(Float4x2,float4x2,CG_FLOAT4x2,CG_FLOAT,4,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int1x2,int1x2,CG_INT1x2,1,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int1x3,int1x3,CG_INT1x3,1,3)	CG_DATATYPE_MACRO(Float4x3,float4x3,CG_FLOAT4x3,CG_FLOAT,4,3,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int1x4,int1x4,CG_INT1x4,1,4)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int2x1,int2x1,CG_INT2x1,2,1)	CG_DATATYPE_MACRO(Float4x4,float4x4,CG_FLOAT4x4,CG_FLOAT,4,4,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Int2x2,int2x2,CG_INT2x2,2,2)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Int2x3,int2x3,CG_INT2x3,2,3)	CG_DATATYPE_MACRO(Sampler1D,sampler1D,CG_SAMPLER1D,CG_SAMPLER1D,0,0,CG_PARA
	CG_DATATYPE_MACRO(Int2x4,int2x4,CG_INT2x4,2,4)	METERCLASS_SAMPLER)
	CG_DATATYPE_MACRO(Int3x1,int3x1,CG_INT3x1,3,1)	CG_DATATYPE_MACRO(Sampler2D,sampler2D,CG_SAMPLER2D,CG_SAMPLER2D,0,0,CG_PARA
	CG_DATATYPE_MACRO(Int3x2,int3x2,CG_INT3x2,3,2)	METERCLASS_SAMPLER)
	CG_DATATYPE_MACRO(Int3x3,int3x3,CG_INT3x3,3,3)	CG_DATATYPE_MACRO(Sampler3D,sampler3D,CG_SAMPLER3D,CG_SAMPLER3D,0,0,CG_PARA
	CG_DATATYPE_MACRO(Int3x4,int3x4,CG_INT3x4,3,4)	METERCLASS_SAMPLER)
	CG_DATATYPE_MACRO(Int4x1,int4x1,CG_INT4x1,4,1)	CG_DATATYPE_MACRO(SamplerRECT,samplerRECT,CG_SAMPLERRECT,CG_SAMPLERRECT,0,0
	CG_DATATYPE_MACRO(Int4x2,int4x2,CG_INT4x2,4,2)	,CG_PARAMETERCLASS_SAMPLER)
	CG_DATATYPE_MACRO(Int4x3,int4x3,CG_INT4x3,4,3)	CG_DATATYPE_MACRO(SamplerCUBE,samplerCUBE,CG_SAMPLERCUBE,CG_SAMPLERCUBE,0,0
	CG_DATATYPE_MACRO(Int4x4,int4x4,CG_INT4x4,4,4)	,CG_PARAMETERCLASS_SAMPLER)
	CG_DATATYPE_MACRO(Bool,bool,CG_BOOL,0,1)	CG_DATATYPE_MACRO(Fixed,fixed,CG_FIXED,CG_FIXED,0,1,CG_PARAMETERCLASS_SCALA
	CG_DATATYPE_MACRO(Bool1,bool1,CG_BOOL1,0,1)	R)
	CG_DATATYPE_MACRO(Bool2,bool2,CG_BOOL2,0,2)	CG_DATATYPE_MACRO(Fixed2,fixed2,CG_FIXED2,CG_FIXED,0,2,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(Bool3,bool3,CG_BOOL3,0,3)	CTOR)
	CG_DATATYPE_MACRO(Bool4,bool4,CG_BOOL4,0,4)	CG_DATATYPE_MACRO(Fixed3,fixed3,CG_FIXED3,CG_FIXED,0,3,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(Bool1x1,bool1x1,CG_BOOL1x1,1,1)	CTOR)
	CG_DATATYPE_MACRO(Bool1x2,bool1x2,CG_BOOL1x2,1,2)	CG_DATATYPE_MACRO(Fixed4,fixed4,CG_FIXED4,CG_FIXED,0,4,CG_PARAMETERCLASS_VE
	CG_DATATYPE_MACRO(Bool1x3,bool1x3,CG_BOOL1x3,1,3)	CTOR)
	CG_DATATYPE_MACRO(Bool1x4,bool1x4,CG_BOOL1x4,1,4)	CG_DATATYPE_MACRO(Fixed1x1,fixed1x1,CG_FIXED1x1,CG_FIXED,1,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool2x1,bool2x1,CG_BOOL2x1,2,1)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool2x2,bool2x2,CG_BOOL2x2,2,2)	CG_DATATYPE_MACRO(Fixed1x2,fixed1x2,CG_FIXED1x2,CG_FIXED,1,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool2x3,bool2x3,CG_BOOL2x3,2,3)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool2x4,bool2x4,CG_BOOL2x4,2,4)	CG_DATATYPE_MACRO(Fixed1x3,fixed1x3,CG_FIXED1x3,CG_FIXED,1,3,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool3x1,bool3x1,CG_BOOL3x1,3,1)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool3x2,bool3x2,CG_BOOL3x2,3,2)	CG_DATATYPE_MACRO(Fixed1x4,fixed1x4,CG_FIXED1x4,CG_FIXED,1,4,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool3x3,bool3x3,CG_BOOL3x3,3,3)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool3x4,bool3x4,CG_BOOL3x4,3,4)	CG_DATATYPE_MACRO(Fixed2x1,fixed2x1,CG_FIXED2x1,CG_FIXED,2,1,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool4x1,bool4x1,CG_BOOL4x1,4,1)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool4x2,bool4x2,CG_BOOL4x2,4,2)	CG_DATATYPE_MACRO(Fixed2x2,fixed2x2,CG_FIXED2x2,CG_FIXED,2,2,CG_PARAMETERCL
	CG_DATATYPE_MACRO(Bool4x3,bool4x3,CG_BOOL4x3,4,3)	ASS_MATRIX)
	CG_DATATYPE_MACRO(Bool4x4,bool4x4,CG_BOOL4x4,4,4)	CG_DATATYPE_MACRO(Fixed2x3,fixed2x3,CG_FIXED2x3,CG_FIXED,2,3,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed2x4,fixed2x4,CG_FIXED2x4,CG_FIXED,2,4,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed3x1,fixed3x1,CG_FIXED3x1,CG_FIXED,3,1,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed3x2,fixed3x2,CG_FIXED3x2,CG_FIXED,3,2,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed3x3,fixed3x3,CG_FIXED3x3,CG_FIXED,3,3,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed3x4,fixed3x4,CG_FIXED3x4,CG_FIXED,3,4,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed4x1,fixed4x1,CG_FIXED4x1,CG_FIXED,4,1,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed4x2,fixed4x2,CG_FIXED4x2,CG_FIXED,4,2,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed4x3,fixed4x3,CG_FIXED4x3,CG_FIXED,4,3,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Fixed4x4,fixed4x4,CG_FIXED4x4,CG_FIXED,4,4,CG_PARAMETERCL
		ASS_MATRIX)
		CG_DATATYPE_MACRO(Half1,half1,CG_HALF1,CG_HALF,0,1,CG_PARAMETERCLASS_VECTOR
		)
		CG_DATATYPE_MACRO(Float1,float1,CG_FLOAT1,CG_FLOAT,0,1,CG_PARAMETERCLASS_VE
		CTOR)
		CG_DATATYPE_MACRO(Fixed1,fixed1,CG_FIXED1,CG_FIXED,0,1,CG_PARAMETERCLASS_VE
		CTOR)
		CG_DATATYPE_MACRO(Int,int,CG_INT,CG_INT,0,1,CG_PARAMETERCLASS_SCALAR)
		CG_DATATYPE_MACRO(Int1,int1,CG_INT1,CG_INT,0,1,CG_PARAMETERCLASS_VECTOR)
		CG_DATATYPE_MACRO(Int2,int2,CG_INT2,CG_INT,0,2,CG_PARAMETERCLASS_VECTOR)
		CG_DATATYPE_MACRO(Int3,int3,CG_INT3,CG_INT,0,3,CG_PARAMETERCLASS_VECTOR)
		CG_DATATYPE_MACRO(Int4,int4,CG_INT4,CG_INT,0,4,CG_PARAMETERCLASS_VECTOR)
		CG_DATATYPE_MACRO(Int1x1,int1x1,CG_INT1x1,CG_INT,1,1,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int1x2,int1x2,CG_INT1x2,CG_INT,1,2,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int1x3,int1x3,CG_INT1x3,CG_INT,1,3,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int1x4,int1x4,CG_INT1x4,CG_INT,1,4,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int2x1,int2x1,CG_INT2x1,CG_INT,2,1,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int2x2,int2x2,CG_INT2x2,CG_INT,2,2,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int2x3,int2x3,CG_INT2x3,CG_INT,2,3,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int2x4,int2x4,CG_INT2x4,CG_INT,2,4,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int3x1,int3x1,CG_INT3x1,CG_INT,3,1,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int3x2,int3x2,CG_INT3x2,CG_INT,3,2,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int3x3,int3x3,CG_INT3x3,CG_INT,3,3,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int3x4,int3x4,CG_INT3x4,CG_INT,3,4,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int4x1,int4x1,CG_INT4x1,CG_INT,4,1,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int4x2,int4x2,CG_INT4x2,CG_INT,4,2,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int4x3,int4x3,CG_INT4x3,CG_INT,4,3,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Int4x4,int4x4,CG_INT4x4,CG_INT,4,4,CG_PARAMETERCLASS_MATR
		IX)
		CG_DATATYPE_MACRO(Bool,bool,CG_BOOL,CG_BOOL,0,1,CG_PARAMETERCLASS_SCALAR)
		CG_DATATYPE_MACRO(Bool1,bool1,CG_BOOL1,CG_BOOL,0,1,CG_PARAMETERCLASS_VECTOR
		)
		CG_DATATYPE_MACRO(Bool2,bool2,CG_BOOL2,CG_BOOL,0,2,CG_PARAMETERCLASS_VECTOR
		)
		CG_DATATYPE_MACRO(Bool3,bool3,CG_BOOL3,CG_BOOL,0,3,CG_PARAMETERCLASS_VECTOR
		)
		CG_DATATYPE_MACRO(Bool4,bool4,CG_BOOL4,CG_BOOL,0,4,CG_PARAMETERCLASS_VECTOR
		)
		CG_DATATYPE_MACRO(Bool1x1,bool1x1,CG_BOOL1x1,CG_BOOL,1,1,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool1x2,bool1x2,CG_BOOL1x2,CG_BOOL,1,2,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool1x3,bool1x3,CG_BOOL1x3,CG_BOOL,1,3,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool1x4,bool1x4,CG_BOOL1x4,CG_BOOL,1,4,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool2x1,bool2x1,CG_BOOL2x1,CG_BOOL,2,1,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool2x2,bool2x2,CG_BOOL2x2,CG_BOOL,2,2,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool2x3,bool2x3,CG_BOOL2x3,CG_BOOL,2,3,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool2x4,bool2x4,CG_BOOL2x4,CG_BOOL,2,4,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool3x1,bool3x1,CG_BOOL3x1,CG_BOOL,3,1,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool3x2,bool3x2,CG_BOOL3x2,CG_BOOL,3,2,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool3x3,bool3x3,CG_BOOL3x3,CG_BOOL,3,3,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool3x4,bool3x4,CG_BOOL3x4,CG_BOOL,3,4,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool4x1,bool4x1,CG_BOOL4x1,CG_BOOL,4,1,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool4x2,bool4x2,CG_BOOL4x2,CG_BOOL,4,2,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool4x3,bool4x3,CG_BOOL4x3,CG_BOOL,4,3,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(Bool4x4,bool4x4,CG_BOOL4x4,CG_BOOL,4,4,CG_PARAMETERCLASS_
		MATRIX)
		CG_DATATYPE_MACRO(String,string,CG_STRING,CG_STRING,0,1,CG_PARAMETERCLASS_O
		BJECT)
		CG_DATATYPE_MACRO(Program,program,CG_PROGRAM_TYPE,CG_PROGRAM_TYPE,0,0,CG_PA
		RAMETERCLASS_OBJECT)
		CG_DATATYPE_MACRO(Texture,texture,CG_TEXTURE,CG_TEXTURE,0,0,CG_PARAMETERCLA
		SS_OBJECT)

	#undef CG_DATATYPE_MACRO	#undef CG_DATATYPE_MACRO

End of changes. 2 change blocks.
	112 lines changed or deleted	221 lines changed or added

	cg_enums.h	cg_enums.h

	skipping to change at line 89	skipping to change at line 89
	CG_ENUM_MACRO(CG_DEFAULT, 4110)	CG_ENUM_MACRO(CG_DEFAULT, 4110)
	CG_ENUM_MACRO(CG_ERROR, 4111)	CG_ENUM_MACRO(CG_ERROR, 4111)
	CG_ENUM_MACRO(CG_SOURCE, 4112)	CG_ENUM_MACRO(CG_SOURCE, 4112)
	CG_ENUM_MACRO(CG_OBJECT, 4113)	CG_ENUM_MACRO(CG_OBJECT, 4113)
	CG_ENUM_MACRO(CG_COMPILE_MANUAL, 4114)	CG_ENUM_MACRO(CG_COMPILE_MANUAL, 4114)
	CG_ENUM_MACRO(CG_COMPILE_IMMEDIATE, 4115)	CG_ENUM_MACRO(CG_COMPILE_IMMEDIATE, 4115)
	CG_ENUM_MACRO(CG_COMPILE_LAZY, 4116)	CG_ENUM_MACRO(CG_COMPILE_LAZY, 4116)
	CG_ENUM_MACRO(CG_CURRENT, 4117)	CG_ENUM_MACRO(CG_CURRENT, 4117)
	CG_ENUM_MACRO(CG_LITERAL, 4118)	CG_ENUM_MACRO(CG_LITERAL, 4118)
	CG_ENUM_MACRO(CG_VERSION, 4119)	CG_ENUM_MACRO(CG_VERSION, 4119)

		CG_ENUM_MACRO(CG_ROW_MAJOR, 4120)
		CG_ENUM_MACRO(CG_COLUMN_MAJOR, 4121)
	#undef CG_ENUM_MACRO	#undef CG_ENUM_MACRO

End of changes. 1 change blocks.
	1 lines changed or deleted	2 lines changed or added

	cg_errors.h	cg_errors.h
	/*	/*
	*	*

	* Copyright (c) 2002, NVIDIA Corporation.	* Copyright (c) 2002-2004, NVIDIA Corporation.
	*	*
	*	*
	*	*
	* NVIDIA Corporation("NVIDIA") supplies this software to you in considerat ion	* NVIDIA Corporation("NVIDIA") supplies this software to you in considerat ion
	* of your agreement to the following terms, and your use, installation,	* of your agreement to the following terms, and your use, installation,
	* modification or redistribution of this NVIDIA software constitutes	* modification or redistribution of this NVIDIA software constitutes
	* acceptance of these terms. If you do not agree with these terms, please do	* acceptance of these terms. If you do not agree with these terms, please do
	* not use, install, modify or redistribute this NVIDIA software.	* not use, install, modify or redistribute this NVIDIA software.
	*	*
	*	*

	skipping to change at line 232	skipping to change at line 232
	CG_ERROR_MACRO(38,	CG_ERROR_MACRO(38,
	CG_ARRAY_HAS_WRONG_DIMENSION_ERROR,	CG_ARRAY_HAS_WRONG_DIMENSION_ERROR,
	"The array is has the wrong dimension.")	"The array is has the wrong dimension.")

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


		CG_ERROR_MACRO(40,
		CG_INVALID_EFFECT_HANDLE_ERROR,
		"Invalid effect handle.")

		CG_ERROR_MACRO(41,
		CG_INVALID_STATE_HANDLE_ERROR,
		"Invalid state handle.")

		CG_ERROR_MACRO(42,
		CG_INVALID_STATE_ASSIGNMENT_HANDLE_ERROR,
		"Invalid stateassignment handle.")

		CG_ERROR_MACRO(43,
		CG_INVALID_PASS_HANDLE_ERROR,
		"Invalid pass handle.")

		CG_ERROR_MACRO(44,
		CG_INVALID_ANNOTATION_HANDLE_ERROR,
		"Invalid annotation handle.")

		CG_ERROR_MACRO(45,
		CG_INVALID_TECHNIQUE_HANDLE_ERROR,
		"Invalid technique handle.")

		CG_ERROR_MACRO(46,
		CG_INVALID_PARAMETER_HANDLE_ERROR,
		"Invalid parameter handle.")

		CG_ERROR_MACRO(47,
		CG_STATE_ASSIGNMENT_TYPE_MISMATCH_ERROR,
		"Invalid parameter handle.")

		CG_ERROR_MACRO(48,
		CG_INVALID_FUNCTION_HANDLE_ERROR,
		"Invalid function handle.")

		CG_ERROR_MACRO(49,
		CG_INVALID_TECHNIQUE_ERROR,
		"Technique did not pass validation.")

		CG_ERROR_MACRO(50,
		CG_INVALID_POINTER_ERROR,
		"The supplied pointer is NULL.")

		CG_ERROR_MACRO(51,
		CG_NOT_ENOUGH_DATA_ERROR,
		"Not enough data was provided.")

		CG_ERROR_MACRO(52,
		CG_NON_NUMERIC_PARAMETER_ERROR,
		"The parameter is not of a numeric type.")

		CG_ERROR_MACRO(53,
		CG_ARRAY_SIZE_MISMATCH_ERROR,
		"The specified array sizes are not compatible with the given
		array.")

	#undef CG_ERROR_MACRO	#undef CG_ERROR_MACRO

End of changes. 2 change blocks.
	1 lines changed or deleted	58 lines changed or added

	cg_profiles.h	cg_profiles.h

	skipping to change at line 85	skipping to change at line 85
	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(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(Generic, generic, GENERIC, "generic", 7002,0)

	#undef CG_PROFILE_MACRO	#undef CG_PROFILE_MACRO
	#undef CG_IN_PROFILES_INCLUDE	#undef CG_IN_PROFILES_INCLUDE

End of changes. 1 change blocks.
	0 lines changed or deleted	2 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/