Commits

Holger Frydrych committed 99d8c70

Updated Cg Windows files to 3.1

Comments (0)

Files changed (5)

src/Cg/bin/cg.dll

Binary file modified.

src/Cg/bin64/cg.dll

Binary file modified.

src/Cg/include/Cg/cg.h

 /*
  *
- * Copyright (c) 2002-2010, NVIDIA Corporation.
+ * Copyright (c) 2002-2012, NVIDIA Corporation.
  *
  *
  *
 /*** CG Run-Time Library API                                           ***/
 /*************************************************************************/
 
-#define CG_VERSION_NUM                3000
+#define CG_VERSION_NUM                3100
 
 #ifdef _WIN32
 # ifndef APIENTRY /* From Win32's <windef.h> */
   CG_BEHAVIOR_LATEST  = 1,                /* latest behavior supported at runtime      */
   CG_BEHAVIOR_2200    = 1000,             /* default behavior                          */
   CG_BEHAVIOR_3000    = 2000,
-  CG_BEHAVIOR_CURRENT = CG_BEHAVIOR_3000  /* latest behavior supported at compile time */
+  CG_BEHAVIOR_3100    = 3000,
+  CG_BEHAVIOR_CURRENT = CG_BEHAVIOR_3100  /* latest behavior supported at compile time */
 } CGbehavior;
 
 typedef enum
   CG_STRUCT            = 1,
   CG_TYPELESS_STRUCT   = 3,
   CG_TEXTURE           = 1137,
+  CG_BUFFER            = 1319,
+  CG_UNIFORMBUFFER     = 1320,
+  CG_ADDRESS           = 1321,
   CG_PIXELSHADER_TYPE  = 1142,
   CG_PROGRAM_TYPE      = 1136,
   CG_VERTEXSHADER_TYPE = 1141,
-  CG_TYPE_START_ENUM   = 1024,
   CG_SAMPLER           = 1143,
   CG_SAMPLER1D         = 1065,
   CG_SAMPLER1DARRAY    = 1138,
   CG_SAMPLER1DSHADOW   = 1313,
   CG_SAMPLER2D         = 1066,
   CG_SAMPLER2DARRAY    = 1139,
+  CG_SAMPLER2DMS       = 1317, /* ARB_texture_multisample */
+  CG_SAMPLER2DMSARRAY  = 1318, /* ARB_texture_multisample */
   CG_SAMPLER2DSHADOW   = 1314,
   CG_SAMPLER3D         = 1067,
   CG_SAMPLERBUF        = 1144,
   CG_SAMPLERCUBE       = 1069,
   CG_SAMPLERCUBEARRAY  = 1140,
+  CG_SAMPLERRBUF       = 1316, /* NV_explicit_multisample */
   CG_SAMPLERRECT       = 1068,
   CG_SAMPLERRECTSHADOW = 1315,
+  CG_TYPE_START_ENUM   = 1024,
   CG_BOOL              = 1114,
   CG_BOOL1             = 1115,
   CG_BOOL2             = 1116,
   CG_CONTROLPOINTID        = 4417,
   CG_EDGETESS              = 4418,
   CG_INNERTESS             = 4419,
+  CG_SAMPLEPOS             = 4420,
+  CG_NUMSAMPLES            = 4421,
   CG_UNDEFINED             = 3256
 } CGresource;
 
   CG_PROFILE_FP40    = 6151,
   CG_PROFILE_ARBFP1  = 7000,
   CG_PROFILE_VP40    = 7001,
-  CG_PROFILE_GLSLV   = 7007,
-  CG_PROFILE_GLSLF   = 7008,
-  CG_PROFILE_GLSLG   = 7016,
-  CG_PROFILE_GLSLC   = 7009,
+  CG_PROFILE_GLSLV   = 7007, /* GLSL vertex shader                                       */
+  CG_PROFILE_GLSLF   = 7008, /* GLSL fragment shader                                     */
+  CG_PROFILE_GLSLG   = 7016, /* GLSL geometry shader                                     */
+  CG_PROFILE_GLSLC   = 7009, /* Combined GLSL program                                    */
   CG_PROFILE_GPU_FP  = 7010, /* Deprecated alias for CG_PROFILE_GP4FP                    */
   CG_PROFILE_GPU_VP  = 7011, /* Deprecated alias for CG_PROFILE_GP4VP                    */
   CG_PROFILE_GPU_GP  = 7012, /* Deprecated alias for CG_PROFILE_GP4GP                    */
-  CG_PROFILE_GP4FP   = 7010,
-  CG_PROFILE_GP4VP   = 7011,
-  CG_PROFILE_GP4GP   = 7012,
-  CG_PROFILE_GP5FP   = 7017, /* NV_gpu_program5                                          */
-  CG_PROFILE_GP5VP   = 7018, /* NV_gpu_program5                                          */
-  CG_PROFILE_GP5GP   = 7019, /* NV_gpu_program5                                          */
-  CG_PROFILE_GP5TCP  = 7020, /* NV_tessellation_program5 Tessellation control program    */
-  CG_PROFILE_GP5TEP  = 7021, /* NV_tessellation_program5 Tessellation evaluation program */
+  CG_PROFILE_GP4FP   = 7010, /* NV_gpu_program4 fragment program                         */
+  CG_PROFILE_GP4VP   = 7011, /* NV_gpu_program4 vertex program                           */
+  CG_PROFILE_GP4GP   = 7012, /* NV_gpu_program4 geometry program                         */
+  CG_PROFILE_GP5FP   = 7017, /* NV_gpu_program5 fragment program                         */
+  CG_PROFILE_GP5VP   = 7018, /* NV_gpu_program5 vertex program                           */
+  CG_PROFILE_GP5GP   = 7019, /* NV_gpu_program5 geometry program                         */
+  CG_PROFILE_GP5TCP  = 7020, /* NV_tessellation_program5 tessellation control program    */
+  CG_PROFILE_GP5TEP  = 7021, /* NV_tessellation_program5 tessellation evaluation program */
   CG_PROFILE_VS_1_1  = 6153,
   CG_PROFILE_VS_2_0  = 6154,
   CG_PROFILE_VS_2_X  = 6155,
   CG_PROFILE_VS_2_SW = 6156,
-  CG_PROFILE_VS_3_0  = 6157,
-  CG_PROFILE_HLSLV   = 6158,
   CG_PROFILE_PS_1_1  = 6159,
   CG_PROFILE_PS_1_2  = 6160,
   CG_PROFILE_PS_1_3  = 6161,
   CG_PROFILE_PS_2_0  = 6162,
   CG_PROFILE_PS_2_X  = 6163,
   CG_PROFILE_PS_2_SW = 6164,
-  CG_PROFILE_PS_3_0  = 6165,
-  CG_PROFILE_HLSLF   = 6166,
-  CG_PROFILE_VS_4_0  = 6167,
-  CG_PROFILE_PS_4_0  = 6168,
-  CG_PROFILE_GS_4_0  = 6169,
-  CG_PROFILE_VS_5_0  = 6170,
-  CG_PROFILE_PS_5_0  = 6171,
-  CG_PROFILE_GS_5_0  = 6172,
-  CG_PROFILE_HS_5_0  = 6173,
-  CG_PROFILE_DS_5_0  = 6174,
+  CG_PROFILE_VS_3_0  = 6157, /* DX9 vertex shader                                        */
+  CG_PROFILE_PS_3_0  = 6165, /* DX9 pixel shader                                         */
+  CG_PROFILE_HLSLV   = 6158, /* DX9 HLSL vertex shader                                   */
+  CG_PROFILE_HLSLF   = 6166, /* DX9 HLSL fragment shader                                 */
+  CG_PROFILE_VS_4_0  = 6167, /* DX10 vertex shader                                       */
+  CG_PROFILE_PS_4_0  = 6168, /* DX10 pixel shader                                        */
+  CG_PROFILE_GS_4_0  = 6169, /* DX10 geometry shader                                     */
+  CG_PROFILE_VS_5_0  = 6170, /* DX11 vertex shader                                       */
+  CG_PROFILE_PS_5_0  = 6171, /* DX11 pixel shader                                        */
+  CG_PROFILE_GS_5_0  = 6172, /* DX11 geometry shader                                     */
+  CG_PROFILE_HS_5_0  = 6173, /* DX11 hull shader (tessellation control)                  */
+  CG_PROFILE_DS_5_0  = 6174, /* DX11 domain shader (tessellation evaluation)             */
   CG_PROFILE_GENERIC = 7002
 } CGprofile;
 
   CG_PARAMETERCLASS_STRUCT  = 4,
   CG_PARAMETERCLASS_ARRAY   = 5,
   CG_PARAMETERCLASS_SAMPLER = 6,
-  CG_PARAMETERCLASS_OBJECT  = 7
+  CG_PARAMETERCLASS_OBJECT  = 7,
+  CG_PARAMETERCLASS_BUFFER  = 8
 } CGparameterclass;
 
 typedef enum
 CG_API void CGENTRY cgSetProgramProfile(CGprogram program, CGprofile profile);
 CG_API CGenum CGENTRY cgGetProgramInput(CGprogram program);
 CG_API CGenum CGENTRY cgGetProgramOutput(CGprogram program);
+CG_API int CGENTRY cgGetProgramOutputVertices(CGprogram program);
+CG_API void CGENTRY cgSetProgramOutputVertices(CGprogram program, int vertices);
 CG_API void CGENTRY cgSetPassProgramParameters(CGprogram program);
 CG_API void CGENTRY cgUpdateProgramParameters(CGprogram program);
 CG_API void CGENTRY cgUpdatePassParameters(CGpass pass);
 CG_API CGparameter CGENTRY cgGetConnectedToParameter(CGparameter param, int index);
 CG_API CGparameter CGENTRY cgGetNamedParameter(CGprogram program, const char *name);
 CG_API CGparameter CGENTRY cgGetNamedProgramParameter(CGprogram program, CGenum name_space, const char *name);
+CG_API CGparameter CGENTRY cgGetNamedProgramUniformBuffer(CGprogram program, const char *blockName);
+CG_API CGparameter CGENTRY cgGetNamedEffectUniformBuffer(CGeffect effect, const char *blockName);
+CG_API const char * CGENTRY cgGetUniformBufferBlockName(CGparameter param);
 CG_API CGparameter CGENTRY cgGetFirstParameter(CGprogram program, CGenum name_space);
 CG_API CGparameter CGENTRY cgGetNextParameter(CGparameter current);
 CG_API CGparameter CGENTRY cgGetFirstLeafParameter(CGprogram program, CGenum name_space);
 CG_API CGparameter CGENTRY cgGetNextLeafParameter(CGparameter current);
 CG_API CGparameter CGENTRY cgGetFirstStructParameter(CGparameter param);
+CG_API CGparameter CGENTRY cgGetFirstUniformBufferParameter(CGparameter param);
 CG_API CGparameter CGENTRY cgGetNamedStructParameter(CGparameter param, const char *name);
+CG_API CGparameter CGENTRY cgGetNamedUniformBufferParameter(CGparameter param, const char *name);
 CG_API CGparameter CGENTRY cgGetFirstDependentParameter(CGparameter param);
 CG_API CGparameter CGENTRY cgGetArrayParameter(CGparameter aparam, int index);
 CG_API int CGENTRY cgGetArrayDimension(CGparameter param);
 CG_API void CGENTRY cgGetMatrixSize(CGtype type, int *nrows, int *ncols);
 CG_API int CGENTRY cgGetNumProgramDomains(CGprogram program);
 CG_API CGdomain CGENTRY cgGetProfileDomain(CGprofile profile);
+CG_API CGprofile CGENTRY cgGetProfileSibling(CGprofile profile, CGdomain domain);
 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 int CGENTRY cgGetParameterBufferIndex(CGparameter param);
 CG_API int CGENTRY cgGetParameterBufferOffset(CGparameter param);
 CG_API CGbuffer CGENTRY cgCreateBuffer(CGcontext context, int size, const void *data, CGbufferusage bufferUsage);
+CG_API CGbool CGENTRY cgIsBuffer(CGbuffer buffer);
 CG_API void CGENTRY cgSetBufferData(CGbuffer buffer, int size, const void *data);
 CG_API void CGENTRY cgSetBufferSubData(CGbuffer buffer, int offset, int size, const void *data);
 CG_API void CGENTRY cgSetProgramBuffer(CGprogram program, int bufferIndex, CGbuffer buffer);
+CG_API void CGENTRY cgSetUniformBufferParameter(CGparameter param, CGbuffer buffer);
 CG_API void * CGENTRY cgMapBuffer(CGbuffer buffer, CGbufferaccess access);
 CG_API void CGENTRY cgUnmapBuffer(CGbuffer buffer);
 CG_API void CGENTRY cgDestroyBuffer(CGbuffer buffer);
 CG_API CGbuffer CGENTRY cgGetProgramBuffer(CGprogram program, int bufferIndex);
+CG_API CGbuffer CGENTRY cgGetUniformBufferParameter(CGparameter param);
 CG_API int CGENTRY cgGetBufferSize(CGbuffer buffer);
 CG_API int CGENTRY cgGetProgramBufferMaxSize(CGprofile profile);
 CG_API int CGENTRY cgGetProgramBufferMaxIndex(CGprofile profile);

src/Cg/lib/cg.lib

Binary file modified.

src/Cg/lib64/cg.lib

Binary file modified.