diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2011-02-05 05:55:12 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2011-02-05 05:55:12 +0000 |
| commit | 7fc40de8c7384a93a4dd2be596a3a38eee3447fd (patch) | |
| tree | d548400b945235b2a700a05170853afea83babf6 | |
| parent | d6eb1bb97a7adc89e9ca1bb48a93fd45bbe0d2a6 (diff) | |
update Cg on windows to 3.0 November 2010...I tested it and didn't see the problems mentioned in issue 4009.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7078 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Externals/Cg/cg.dll | bin | 6371944 -> 6384232 bytes | |||
| -rw-r--r-- | Externals/Cg/cg.h | 48 | ||||
| -rw-r--r-- | Externals/Cg/cg.lib | bin | 81986 -> 81986 bytes | |||
| -rw-r--r-- | Externals/Cg/cgGL.dll | bin | 363112 -> 363112 bytes | |||
| -rw-r--r-- | Externals/Cg/cgGL.lib | bin | 21740 -> 21740 bytes | |||
| -rw-r--r-- | Externals/Cg64/cg.dll | bin | 9542248 -> 9562728 bytes | |||
| -rw-r--r-- | Externals/Cg64/cg.lib | bin | 80248 -> 80248 bytes | |||
| -rw-r--r-- | Externals/Cg64/cgGL.dll | bin | 453736 -> 453224 bytes | |||
| -rw-r--r-- | Externals/Cg64/cgGL.lib | bin | 21328 -> 21328 bytes |
9 files changed, 24 insertions, 24 deletions
diff --git a/Externals/Cg/cg.dll b/Externals/Cg/cg.dll Binary files differindex a640aced33..a53be8a11e 100644 --- a/Externals/Cg/cg.dll +++ b/Externals/Cg/cg.dll diff --git a/Externals/Cg/cg.h b/Externals/Cg/cg.h index d1e1c5bc82..f2f95d2593 100644 --- a/Externals/Cg/cg.h +++ b/Externals/Cg/cg.h @@ -757,43 +757,43 @@ typedef enum 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; diff --git a/Externals/Cg/cg.lib b/Externals/Cg/cg.lib Binary files differindex ec8b5c81ac..0814d5c3c4 100644 --- a/Externals/Cg/cg.lib +++ b/Externals/Cg/cg.lib diff --git a/Externals/Cg/cgGL.dll b/Externals/Cg/cgGL.dll Binary files differindex 1285c6b2b7..3c25e4d983 100644 --- a/Externals/Cg/cgGL.dll +++ b/Externals/Cg/cgGL.dll diff --git a/Externals/Cg/cgGL.lib b/Externals/Cg/cgGL.lib Binary files differindex 8430501358..4acf1c5088 100644 --- a/Externals/Cg/cgGL.lib +++ b/Externals/Cg/cgGL.lib diff --git a/Externals/Cg64/cg.dll b/Externals/Cg64/cg.dll Binary files differindex 9ac5675348..640e4fc25c 100644 --- a/Externals/Cg64/cg.dll +++ b/Externals/Cg64/cg.dll diff --git a/Externals/Cg64/cg.lib b/Externals/Cg64/cg.lib Binary files differindex 806a0c84db..4100a06860 100644 --- a/Externals/Cg64/cg.lib +++ b/Externals/Cg64/cg.lib diff --git a/Externals/Cg64/cgGL.dll b/Externals/Cg64/cgGL.dll Binary files differindex d43ade7349..9de32e673f 100644 --- a/Externals/Cg64/cgGL.dll +++ b/Externals/Cg64/cgGL.dll diff --git a/Externals/Cg64/cgGL.lib b/Externals/Cg64/cgGL.lib Binary files differindex ef88576344..c966901271 100644 --- a/Externals/Cg64/cgGL.lib +++ b/Externals/Cg64/cgGL.lib |
