upgrade to nvidia Cg 2.2

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3145 8ced0084-cf51-0410-be5f-012b33b47a6e

Externals/Cg/cg.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  *
  *
  *
@@ -57,7 +57,7 @@
 /*** CG Run-Time Library API                                          ***/
 /*************************************************************************/
 
-#define CG_VERSION_NUM                2000
+#define CG_VERSION_NUM                2200
 
 #ifdef _WIN32
 # ifndef APIENTRY /* From Win32's <windef.h> */
@@ -123,7 +123,7 @@ typedef struct _CGannotation *CGannotation;
 typedef void *CGhandle;
 
 
-//!!! PREPROCESS BEGIN
+/*!!! PREPROCESS BEGIN */
 
 typedef enum
  {
@@ -133,15 +133,13 @@ typedef enum
   CG_TYPELESS_STRUCT,
 
   CG_TYPE_START_ENUM = 1024,
-# define CG_DATATYPE_MACRO(name, compiler_name, enum_name, base_name, ncols, nrows, pc) \
+#define CG_DATATYPE_MACRO(name, compiler_name, enum_name, base_name, ncols, nrows, pc) \
   enum_name ,
 
 #include <Cg/cg_datatypes.h>
+#undef CG_DATATYPE_MACRO
 
-# undef CG_DATATYPE_MACRO
-
-  
-
+  CG_TYPE_MAX
  } CGtype;
 
 typedef enum
@@ -152,8 +150,7 @@ typedef enum
 
 #include <Cg/cg_bindlocations.h>
 
-  CG_UNDEFINED = 3256,
-
+  CG_UNDEFINED = 3256
  } CGresource;
 
 typedef enum
@@ -161,29 +158,35 @@ typedef enum
   CG_PROFILE_START = 6144,
   CG_PROFILE_UNKNOWN,
 
-# define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,int_id,vertex_profile) \
-   CG_PROFILE_##compiler_id_caps = int_id,
+#define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,int_id,vertex_profile) \
+  CG_PROFILE_##compiler_id_caps = int_id,
+#define CG_PROFILE_ALIAS(name, compiler_id, compiler_id_caps, compiler_opt,int_id,vertex_profile) \
+  CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,int_id,vertex_profile)
 
 #include <Cg/cg_profiles.h>
 
-  CG_PROFILE_MAX = 7100,
+  CG_PROFILE_MAX = 7100
  } CGprofile;
 
 typedef enum
  {
-# define CG_ERROR_MACRO(code, enum_name, message) \
+#define CG_ERROR_MACRO(code, enum_name, message) \
    enum_name = code,
-# include <Cg/cg_errors.h>
+#include <Cg/cg_errors.h>
+
+  CG_ERROR_MAX
  } CGerror;
 
 typedef enum
  {
-# define CG_ENUM_MACRO(enum_name, enum_val) \
-   enum_name = enum_val,
-# include <Cg/cg_enums.h>
+#define CG_ENUM_MACRO(enum_name, enum_val) \
+  enum_name = enum_val,
+#include <Cg/cg_enums.h>
+
+  CG_ENUM_MAX
  } CGenum;
 
-//!!! PREPROCESS END
+/*!!! PREPROCESS END */
 
 typedef enum
  {
@@ -194,39 +197,47 @@ typedef enum
   CG_PARAMETERCLASS_STRUCT,
   CG_PARAMETERCLASS_ARRAY,
   CG_PARAMETERCLASS_SAMPLER,
-  CG_PARAMETERCLASS_OBJECT
+  CG_PARAMETERCLASS_OBJECT,
+
+  CG_PARAMETERCLASS_MAX
  } CGparameterclass;
 
 typedef enum
 {
-    CG_UNKNOWN_DOMAIN = 0,
-    CG_FIRST_DOMAIN   = 1,
-    CG_VERTEX_DOMAIN  = 1,
-    CG_FRAGMENT_DOMAIN,
-    CG_GEOMETRY_DOMAIN,
-    CG_NUMBER_OF_DOMAINS
+  CG_UNKNOWN_DOMAIN = 0,
+  CG_FIRST_DOMAIN   = 1,
+  CG_VERTEX_DOMAIN  = 1,
+  CG_FRAGMENT_DOMAIN,
+  CG_GEOMETRY_DOMAIN,
+  CG_NUMBER_OF_DOMAINS,
+
+  CG_DOMAIN_MAX
 } CGdomain;
 
 typedef enum
 {
-    CG_MAP_READ = 0,
-    CG_MAP_WRITE,
-    CG_MAP_READ_WRITE,
-    CG_MAP_WRITE_DISCARD,
-    CG_MAP_WRITE_NO_OVERWRITE
+  CG_MAP_READ = 0,
+  CG_MAP_WRITE,
+  CG_MAP_READ_WRITE,
+  CG_MAP_WRITE_DISCARD,
+  CG_MAP_WRITE_NO_OVERWRITE,
+
+  CG_MAP_MAX
 } CGbufferaccess;
 
 typedef enum
 {
-    CG_BUFFER_USAGE_STREAM_DRAW = 0,
-    CG_BUFFER_USAGE_STREAM_READ,
-    CG_BUFFER_USAGE_STREAM_COPY,
-    CG_BUFFER_USAGE_STATIC_DRAW,
-    CG_BUFFER_USAGE_STATIC_READ,
-    CG_BUFFER_USAGE_STATIC_COPY,
-    CG_BUFFER_USAGE_DYNAMIC_DRAW,
-    CG_BUFFER_USAGE_DYNAMIC_READ,
-    CG_BUFFER_USAGE_DYNAMIC_COPY
+  CG_BUFFER_USAGE_STREAM_DRAW = 0,
+  CG_BUFFER_USAGE_STREAM_READ,
+  CG_BUFFER_USAGE_STREAM_COPY,
+  CG_BUFFER_USAGE_STATIC_DRAW,
+  CG_BUFFER_USAGE_STATIC_READ,
+  CG_BUFFER_USAGE_STATIC_COPY,
+  CG_BUFFER_USAGE_DYNAMIC_DRAW,
+  CG_BUFFER_USAGE_DYNAMIC_READ,
+  CG_BUFFER_USAGE_DYNAMIC_COPY,
+
+  CG_BUFFER_USAGE_MAX
 } CGbufferusage;
 
 #ifdef __cplusplus
@@ -236,6 +247,7 @@ extern "C" {
 typedef CGbool (CGENTRY * CGstatecallback)(CGstateassignment);
 typedef void (CGENTRY * CGerrorCallbackFunc)(void);
 typedef void (CGENTRY * CGerrorHandlerFunc)(CGcontext ctx, CGerror err, void *data);
+typedef void (CGENTRY * CGIncludeCallbackFunc)(CGcontext ctx, const char *filename);
 
 /*************************************************************************/
 /*** Functions                                                         ***/
@@ -262,6 +274,13 @@ CG_API CGenum CGENTRY cgGetAutoCompile(CGcontext ctx);
 CG_API void CGENTRY cgSetParameterSettingMode(CGcontext ctx, CGenum parameterSettingMode);
 CG_API CGenum CGENTRY cgGetParameterSettingMode(CGcontext ctx);
 
+/*** Inclusion ***/
+
+CG_API void CGENTRY cgSetCompilerIncludeString(CGcontext ctx, const char *name, const char *source);
+CG_API void CGENTRY cgSetCompilerIncludeFile(CGcontext ctx, const char *name, const char *filename);
+CG_API void CGENTRY cgSetCompilerIncludeCallback(CGcontext ctx, CGIncludeCallbackFunc func);
+CG_API CGIncludeCallbackFunc CGENTRY cgGetCompilerIncludeCallback(CGcontext ctx);
+
 /*** Program functions ***/
 
 CG_API CGprogram CGENTRY cgCreateProgram(CGcontext ctx,
@@ -294,6 +313,7 @@ CG_API CGenum CGENTRY cgGetProgramInput(CGprogram program);
 CG_API CGenum CGENTRY cgGetProgramOutput(CGprogram program);
 CG_API void CGENTRY cgSetPassProgramParameters(CGprogram);
 CG_API void CGENTRY cgUpdateProgramParameters(CGprogram program);
+CG_API void CGENTRY cgUpdatePassParameters(CGpass pass);
 
 /*** Parameter functions ***/
 
@@ -370,6 +390,12 @@ CG_API int CGENTRY cgGetParameterValuefr(CGparameter param, int n, float *vals);
 CG_API int CGENTRY cgGetParameterValuefc(CGparameter param, int n, float *vals);
 CG_API int CGENTRY cgGetParameterValueir(CGparameter param, int n, int *vals);
 CG_API int CGENTRY cgGetParameterValueic(CGparameter param, int n, int *vals);
+CG_API int CGENTRY cgGetParameterDefaultValuedr(CGparameter param, int n, double *vals);
+CG_API int CGENTRY cgGetParameterDefaultValuedc(CGparameter param, int n, double *vals);
+CG_API int CGENTRY cgGetParameterDefaultValuefr(CGparameter param, int n, float *vals);
+CG_API int CGENTRY cgGetParameterDefaultValuefc(CGparameter param, int n, float *vals);
+CG_API int CGENTRY cgGetParameterDefaultValueir(CGparameter param, int n, int *vals);
+CG_API int CGENTRY cgGetParameterDefaultValueic(CGparameter param, int n, int *vals);
 CG_API const char * CGENTRY cgGetStringParameterValue(CGparameter param);
 CG_API void CGENTRY cgSetStringParameterValue(CGparameter param, const char *str);
 
@@ -435,6 +461,8 @@ CG_API void CGENTRY cgGetMatrixParameteric(CGparameter param, int *matrix);
 CG_API void CGENTRY cgGetMatrixParameterdc(CGparameter param, double *matrix);
 CG_API void CGENTRY cgGetMatrixParameterfc(CGparameter param, float *matrix);
 
+CG_API CGenum CGENTRY cgGetMatrixParameterOrder(CGparameter param);
+
 CG_API CGparameter CGENTRY cgGetNamedSubParameter(CGparameter param, const char *name);
 
 /*** Type Functions ***/
@@ -467,6 +495,21 @@ CG_API CGenum CGENTRY cgGetEnum(const char *enum_string);
 
 CG_API const char * CGENTRY cgGetProfileString(CGprofile profile);
 CG_API CGprofile CGENTRY cgGetProfile(const char *profile_string);
+CG_API int CGENTRY cgGetNumSupportedProfiles(void);
+CG_API CGprofile CGENTRY cgGetSupportedProfile(int index);
+CG_API CGbool CGENTRY cgIsProfileSupported(CGprofile profile);
+CG_API CGbool CGENTRY cgGetProfileProperty(CGprofile profile, CGenum query);
+
+/*** ParameterClass Functions ***/
+
+CG_API const char * CGENTRY cgGetParameterClassString(CGparameterclass pc);
+CG_API CGparameterclass CGENTRY cgGetParameterClassEnum(const char * pString);
+
+/*** Domain Functions ***/
+
+CG_API const char * CGENTRY cgGetDomainString(CGdomain domain);
+CG_API CGdomain CGENTRY cgGetDomain(const char *domain_string);
+CG_API CGdomain CGENTRY cgGetProgramDomain(CGprogram program);
 
 /*** Error Functions ***/
 
@@ -517,6 +560,7 @@ CG_API CGpass CGENTRY cgGetNextPass(CGpass);
 CG_API CGbool CGENTRY cgIsPass(CGpass);
 CG_API const char * CGENTRY cgGetPassName(CGpass);
 CG_API CGtechnique CGENTRY cgGetPassTechnique(CGpass);
+CG_API CGprogram CGENTRY cgGetPassProgram(CGpass pass, CGdomain domain);
 
 CG_API void CGENTRY cgSetPassState(CGpass);
 CG_API void CGENTRY cgResetPassState(CGpass);
@@ -552,9 +596,11 @@ CG_API CGstate CGENTRY cgCreateState(CGcontext, const char *name, CGtype);
 CG_API CGstate CGENTRY cgCreateArrayState(CGcontext, const char *name, CGtype, int nelems);
 CG_API void CGENTRY cgSetStateCallbacks(CGstate, CGstatecallback set, CGstatecallback reset,
                                    CGstatecallback validate);
+CG_API void CGENTRY cgSetStateLatestProfile(CGstate, CGprofile);
 CG_API CGstatecallback CGENTRY cgGetStateSetCallback(CGstate);
 CG_API CGstatecallback CGENTRY cgGetStateResetCallback(CGstate);
 CG_API CGstatecallback CGENTRY cgGetStateValidateCallback(CGstate);
+CG_API CGprofile CGENTRY cgGetStateLatestProfile(CGstate);
 CG_API CGcontext CGENTRY cgGetStateContext(CGstate);
 CG_API CGtype CGENTRY cgGetStateType(CGstate);
 CG_API const char * CGENTRY cgGetStateName(CGstate);
@@ -649,6 +695,8 @@ CG_API CGbool CGENTRY cgSetFloatAnnotation(CGannotation, float value);
 CG_API CGbool CGENTRY cgSetBoolAnnotation(CGannotation, CGbool value);
 CG_API CGbool CGENTRY cgSetStringAnnotation(CGannotation, const char *value);
 
+CG_API int CGENTRY cgGetNumStateEnumerants(CGstate);
+CG_API const char * CGENTRY cgGetStateEnumerant(CGstate, int index, int* value);
 CG_API const char * CGENTRY cgGetStateEnumerantName(CGstate, int value);
 CG_API int CGENTRY cgGetStateEnumerantValue(CGstate, const char *name);
 
@@ -665,6 +713,7 @@ CG_API CGprogram CGENTRY cgCombinePrograms( int n, const CGprogram *exeList );
 CG_API CGprogram CGENTRY cgCombinePrograms2( const CGprogram exe1, const CGprogram exe2 );
 CG_API CGprogram CGENTRY cgCombinePrograms3( const CGprogram exe1, const CGprogram exe2, const CGprogram exe3 );
 CG_API CGprofile CGENTRY cgGetProgramDomainProfile(CGprogram program, int index);
+CG_API CGprogram CGENTRY cgGetProgramDomainProgram(CGprogram program, int index);
 
 /*** CGobj Functions ***/
 CG_API CGobj CGENTRY cgCreateObj( CGcontext context, CGenum program_type, const char *source, CGprofile profile, const char **args );
@@ -673,6 +722,7 @@ CG_API void CGENTRY cgDestroyObj( CGobj obj );
 
 CG_API long CGENTRY cgGetParameterResourceSize(CGparameter);
 CG_API CGtype CGENTRY cgGetParameterResourceType(CGparameter);
+CG_API const char* CGENTRY cgGetParameterResourceName(CGparameter param);
 CG_API int CGENTRY cgGetParameterBufferIndex(CGparameter);
 CG_API int CGENTRY cgGetParameterBufferOffset(CGparameter);
 

Externals/Cg/cgD3D9.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  * 
  *  
  * 

Externals/Cg/cgGL.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  * 
  *  
  * 
@@ -140,12 +140,14 @@ CGGL_API void CGGLENTRY cgGLDisableProfile(CGprofile profile);
 
 CGGL_API CGprofile CGGLENTRY cgGLGetLatestProfile(CGGLenum profile_type);
 CGGL_API void CGGLENTRY cgGLSetOptimalOptions(CGprofile profile);
+CGGL_API char const ** CGGLENTRY cgGLGetOptimalOptions(CGprofile profile);
 
 /******************************************************************************
  *** Program Managment Functions                                 
  *****************************************************************************/
 
 CGGL_API void CGGLENTRY cgGLLoadProgram(CGprogram program);
+CGGL_API void CGGLENTRY cgGLUnloadProgram(CGprogram program);
 CGGL_API CGbool CGGLENTRY cgGLIsProgramLoaded(CGprogram program);
 CGGL_API void CGGLENTRY cgGLBindProgram(CGprogram program);
 CGGL_API void CGGLENTRY cgGLUnbindProgram(CGprofile profile);

Externals/Cg/cgGL_profiles.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  * 
  *  
  * 
@@ -60,11 +60,16 @@ CG_PROFILE_MACRO(ARBFragment,arbfp1,ARBFP1,"arbfp1",7000,0)
 CG_PROFILE_MACRO(Vertex40,vp40,VP40,"vp40",7001,1)
 CG_PROFILE_MACRO(GLSLVertex,glslv,GLSLV,"glslv",7007,1)
 CG_PROFILE_MACRO(GLSLFragment,glslf,GLSLF,"glslf",7008,0)
+CG_PROFILE_MACRO(GLSLGeometry,glslg,GLSLG,"glslg",7016,0)
 CG_PROFILE_MACRO(GLSLCombined, glslc, GLSLC, "glslc", 7009, 0)
 CG_PROFILE_MACRO(GPUFragment,gpu_fp,GPU_FP,"gp4fp",7010,0)
 CG_PROFILE_MACRO(GPUVertex,gpu_vp,GPU_VP,"gp4vp",7011,1)
 CG_PROFILE_MACRO(GPUGeometry,gpu_gp,GPU_GP,"gp4gp",7012,0)
 
+CG_PROFILE_ALIAS(GPUFragment,gp4fp,GP4FP,"gp4fp",7010,0)
+CG_PROFILE_ALIAS(GPUVertex,gp4vp,GP4VP,"gp4vp",7011,1)
+CG_PROFILE_ALIAS(GPUGeometry,gp4gp,GP4GP,"gp4gp",7012,0)
+
 #ifndef CG_IN_PROFILES_INCLUDE
 # undef CG_PROFILE_MACRO
 #endif

Externals/Cg/cg_bindlocations.h

@@ -2,7 +2,7 @@
 
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  * 
  *  
  * 

Externals/Cg/cg_datatypes.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  * 
  *  
  * 

Externals/Cg/cg_enums.h

@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  *
  *
  *
@@ -107,6 +107,22 @@ CG_ENUM_MACRO(CG_NO_LOCKS_POLICY, 4134)
 CG_ENUM_MACRO(CG_THREAD_SAFE_POLICY, 4135)
 CG_ENUM_MACRO(CG_FORCE_UPPER_CASE_POLICY, 4136)
 CG_ENUM_MACRO(CG_UNCHANGED_CASE_POLICY, 4137)
+CG_ENUM_MACRO(CG_IS_OPENGL_PROFILE, 4138)
+CG_ENUM_MACRO(CG_IS_DIRECT3D_PROFILE, 4139)
+CG_ENUM_MACRO(CG_IS_DIRECT3D_8_PROFILE, 4140)
+CG_ENUM_MACRO(CG_IS_DIRECT3D_9_PROFILE, 4141)
+CG_ENUM_MACRO(CG_IS_DIRECT3D_10_PROFILE, 4142)
+CG_ENUM_MACRO(CG_IS_VERTEX_PROFILE, 4143)
+CG_ENUM_MACRO(CG_IS_FRAGMENT_PROFILE, 4144)
+CG_ENUM_MACRO(CG_IS_GEOMETRY_PROFILE, 4145)
+CG_ENUM_MACRO(CG_IS_TRANSLATION_PROFILE, 4146)
+CG_ENUM_MACRO(CG_IS_HLSL_PROFILE, 4147)
+CG_ENUM_MACRO(CG_IS_GLSL_PROFILE, 4148)
+
+/*
+ if you add any enums here, you must also change
+ the last enum value in the definition of cgiEnumStringMap
+ (currently found in common/cg_enum.cpp)
+*/
+
 #undef CG_ENUM_MACRO
-
-

Externals/Cg/cg_errors.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  *
  *
  *
@@ -255,7 +255,8 @@ CG_ERROR_MACRO(45,
                CG_INVALID_TECHNIQUE_HANDLE_ERROR,
                "Invalid technique handle.")
 
-// Do not use this!  Use CG_INVALID_PARAM_HANDLE_ERROR instead.
+/* Do not use this!  Use CG_INVALID_PARAM_HANDLE_ERROR instead. */
+
 CG_ERROR_MACRO(46,
                CG_INVALID_PARAMETER_HANDLE_ERROR,
                "Invalid parameter handle.")
@@ -316,5 +317,9 @@ CG_ERROR_MACRO(60,
                CG_BUFFER_UPDATE_NOT_ALLOWED_ERROR,
                "The buffer cannot be updated.")
 
+CG_ERROR_MACRO(61,
+               CG_GLSLG_UNCOMBINED_LOAD_ERROR,
+               "The GLSL geometry program can not load without being combined with a vertex program.")
+
 #undef CG_ERROR_MACRO
 

Externals/Cg/cg_profiles.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2008, NVIDIA Corporation.
+ * Copyright (c) 2002-2009, NVIDIA Corporation.
  *
  *
  *
@@ -54,7 +54,7 @@
  *
  * The macros have the form :
  *
- *   CG_PROFILE_MACRO(name, compiler_id, compiler_opt)
+ *   CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt, int_id, vertex_profile)
  *
  *     name         : The name of the profile.  Used consistently with the API.
  *     compiler_id  : The identifier string for the profile used by the compiler.
@@ -70,6 +70,11 @@
 
 #define CG_IN_PROFILES_INCLUDE
 
+/* Used for profile enumeration aliases */
+#ifndef CG_PROFILE_ALIAS
+#define CG_PROFILE_ALIAS(name, compiler_id, compiler_id_caps, compiler_opt, int_id, vertex_profile) /*nothing*/
+#endif
+
 #include <Cg/cgGL_profiles.h>
 
 
@@ -89,7 +94,12 @@ CG_PROFILE_MACRO(DX9Pixel2sw,ps_2_sw,PS_2_SW,"ps_2_sw",6164,0)
 CG_PROFILE_MACRO(DX9Pixel30,ps_3_0,PS_3_0,"ps_3_0",6165,0)
 CG_PROFILE_MACRO(DX9PixelHLSL,hlslf,HLSLF,"hlslf",6166,0)
 
+CG_PROFILE_MACRO(DX10Vertex40,vs_4_0,VS_4_0,"vs_4_0",6167,1)
+CG_PROFILE_MACRO(DX10Pixel40,ps_4_0,PS_4_0,"ps_4_0",6168,0)
+CG_PROFILE_MACRO(DX10Geometry40,gs_4_0,GS_4_0,"gs_4_0",6169,0)
+
 CG_PROFILE_MACRO(Generic,           generic, GENERIC, "generic", 7002,0)
 
 #undef CG_PROFILE_MACRO
+#undef CG_PROFILE_ALIAS
 #undef CG_IN_PROFILES_INCLUDE