Finished the reverting of Cg.

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

9 files changed, 20 insertions, 290 deletions

diff --git a/Externals/Cg/cg.h b/Externals/Cg/cg.h
index 485727a268..63235f90ac 100644
--- a/Externals/Cg/cg.h
+++ b/Externals/Cg/cg.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
@@ -57,7 +57,7 @@
 /*** CG Run-Time Library API                                          ***/
 /*************************************************************************/
 
-#define CG_VERSION_NUM                2100
+#define CG_VERSION_NUM                2000
 
 #ifdef _WIN32
 # ifndef APIENTRY /* From Win32's <windef.h> */
@@ -74,18 +74,15 @@
 # endif
 #endif /* _WIN32 */
 
-/* Set up CG_API for Win32 dllexport or gcc visibility */
-
+/* Set up for either Win32 import/export/lib. */
 #ifndef CG_API
-# ifdef CG_EXPORTS
-#  ifdef _WIN32
+# ifdef _WIN32
+#  ifdef CG_EXPORTS
 #   define CG_API __declspec(dllexport)
-#  elif defined(__GNUC__) && __GNUC__>=4
-#   define CG_API __attribute__ ((visibility("default")))
-#  elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#   define CG_API __global
-#  else
+#  elif defined (CG_LIB)
 #   define CG_API
+#  else
+#   define CG_API __declspec(dllimport)
 #  endif
 # else
 #  define CG_API
@@ -236,7 +233,6 @@ 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                                                         ***/
@@ -263,13 +259,6 @@ 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, 
@@ -302,7 +291,6 @@ 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 ***/
 
@@ -379,12 +367,6 @@ 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);
 
@@ -532,7 +514,6 @@ 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);
@@ -681,7 +662,6 @@ 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 );
@@ -690,7 +670,6 @@ 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);
 
diff --git a/Externals/Cg/cgD3D10.h b/Externals/Cg/cgD3D10.h
deleted file mode 100644
index 3abf196cc0..0000000000
--- a/Externals/Cg/cgD3D10.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*

- *

- * Copyright (c) 2008-2009, NVIDIA Corporation.

- * 

- *  

- * 

- * NVIDIA Corporation("NVIDIA") supplies this software to you in consideration 

- * of your agreement to the following terms, and your use, installation, 

- * modification or redistribution of this NVIDIA software constitutes 

- * acceptance of these terms.  If you do not agree with these terms, please do 

- * not use, install, modify or redistribute this NVIDIA software.

- * 

- *  

- * 

- * In consideration of your agreement to abide by the following terms, and 

- * subject to these terms, NVIDIA grants you a personal, non-exclusive license,

- * under NVIDIA's copyrights in this original NVIDIA software (the "NVIDIA 

- * Software"), to use, reproduce, modify and redistribute the NVIDIA 

- * Software, with or without modifications, in source and/or binary forms; 

- * provided that if you redistribute the NVIDIA Software, you must retain the 

- * copyright notice of NVIDIA, this notice and the following text and 

- * disclaimers in all such redistributions of the NVIDIA Software. Neither the 

- * name, trademarks, service marks nor logos of NVIDIA Corporation may be used 

- * to endorse or promote products derived from the NVIDIA Software without 

- * specific prior written permission from NVIDIA.  Except as expressly stated 

- * in this notice, no other rights or licenses express or implied, are granted 

- * by NVIDIA herein, including but not limited to any patent rights that may be 

- * infringed by your derivative works or by other works in which the NVIDIA 

- * Software may be incorporated. No hardware is licensed hereunder. 

- * 

- *  

- * 

- * THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT 

- * WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 

- * WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, 

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR ITS USE AND OPERATION 

- * EITHER ALONE OR IN COMBINATION WITH OTHER PRODUCTS.

- * 

- *  

- * 

- * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 

- * EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOST 

- * PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 

- * PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY OUT OF THE USE, 

- * REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE, 

- * HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING 

- * NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF NVIDIA HAS BEEN ADVISED 

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * 

- */ 

-

-

-#ifndef __CGD3D10_H__

-#define __CGD3D10_H__

-

-#ifdef _WIN32

-

-#pragma once

-

-#include <windows.h>

-#include <d3d10.h>

-

-#include "Cg/cg.h"

-

-

-

-// Set up for either Win32 import/export/lib.

-#ifdef CGD3D10DLL_EXPORTS

-#define CGD3D10DLL_API __declspec(dllexport)

-#elif defined (CG_LIB)

-#define CGD3D10DLL_API

-#else

-#define CGD3D10DLL_API __declspec(dllimport)

-#endif

-

-#ifndef CGD3D10ENTRY

-# ifdef _WIN32

-#  define CGD3D10ENTRY __cdecl

-# else

-#  define CGD3D10ENTRY

-# endif

-#endif

-

-#ifdef __cplusplus

-extern "C"

-{

-#endif

-

-#ifndef CGD3D10_EXPLICIT

-

-/* ----- D3D Device Control ----- */

-

-CGD3D10DLL_API ID3D10Device * CGD3D10ENTRY

-cgD3D10GetDevice( 

-    CGcontext Context

-);

-

-CGD3D10DLL_API HRESULT CGD3D10ENTRY

-cgD3D10SetDevice( 

-    CGcontext Context, 

-    ID3D10Device * pDevice

-);

-

-/* ----- Texture Functions ----- */

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10SetTextureParameter( 

-    CGparameter Parameter,

-    ID3D10Resource * pTexture

-);

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10SetSamplerStateParameter(

-    CGparameter Parameter,

-    ID3D10SamplerState * pSamplerState

-);

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10SetTextureSamplerStateParameter( 

-    CGparameter Parameter,

-    ID3D10Resource * pTexture,

-    ID3D10SamplerState * pSamplerState

-);

-

-/* ----- Shader Management ----- */

-

-CGD3D10DLL_API HRESULT CGD3D10ENTRY

-cgD3D10LoadProgram(

-    CGprogram Program,    

-    UINT Flags

-);

-

-CGD3D10DLL_API ID3D10Blob * CGD3D10ENTRY

-cgD3D10GetCompiledProgram(

-    CGprogram Program

-);

-

-CGD3D10DLL_API ID3D10Blob * CGD3D10ENTRY

-cgD3D10GetProgramErrors(

-    CGprogram Program

-);

-

-CGD3D10DLL_API CGbool CGD3D10ENTRY

-cgD3D10IsProgramLoaded(

-    CGprogram Program

-);

-

-CGD3D10DLL_API HRESULT CGD3D10ENTRY

-cgD3D10BindProgram(

-    CGprogram Program

-);

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10UnloadProgram(

-    CGprogram Program

-);

-

-/* ----- Buffer Management ----- */

-

-CGD3D10DLL_API ID3D10Buffer * CGD3D10ENTRY

-cgD3D10GetBufferByIndex( 

-    CGprogram Program,

-    UINT Index

-);

-

-/* ----- CgFX ----- */

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10RegisterStates(

-    CGcontext Context

-);

-

-CGD3D10DLL_API void CGD3D10ENTRY

-cgD3D10SetManageTextureParameters( 

-    CGcontext Context, 

-    CGbool Flag 

-);

-

-CGD3D10DLL_API CGbool CGD3D10ENTRY

-cgD3D10GetManageTextureParameters( 

-    CGcontext Context 

-);

-

-CGD3D10DLL_API ID3D10Blob * CGD3D10ENTRY

-cgD3D10GetIASignatureByPass(

-    CGpass Pass

-);

-

-/* ----- Profile Options ----- */

-

-CGD3D10DLL_API CGprofile CGD3D10ENTRY

-cgD3D10GetLatestVertexProfile();

-

-CGD3D10DLL_API CGprofile CGD3D10ENTRY

-cgD3D10GetLatestGeometryProfile();

-

-CGD3D10DLL_API CGprofile CGD3D10ENTRY

-cgD3D10GetLatestPixelProfile();

-

-CGD3D10DLL_API CGbool CGD3D10ENTRY

-cgD3D10IsProfileSupported(

-    CGprofile Profile                          

-);

-

-/* ----- Utility Functions ----- */

-

-CGD3D10DLL_API DWORD CGD3D10ENTRY

-cgD3D10TypeToSize( 

-    CGtype Type

-);

-

-CGD3D10DLL_API HRESULT CGD3D10ENTRY

-cgD3D10GetLastError();

-

-CGD3D10DLL_API const char ** CGD3D10ENTRY

-cgD3D10GetOptimalOptions(

-    CGprofile Profile       

-);

-

-CGD3D10DLL_API const char * CGD3D10ENTRY

-cgD3D10TranslateCGerror(

-    CGerror Error

-);

-

-CGD3D10DLL_API const char * CGD3D10ENTRY

-cgD3D10TranslateHRESULT(

-    HRESULT hr

-);

-

-#endif // #ifndef CGD3D10_EXPLICIT

-

-#ifdef __cplusplus

-}; // extern "C"

-#endif

-

-#endif // #ifdef _WIN32

-

-#endif // #ifndef __CGD3D10_H__

diff --git a/Externals/Cg/cgGL.h b/Externals/Cg/cgGL.h
index f7ab7d0883..8d7d78b13f 100644
--- a/Externals/Cg/cgGL.h
+++ b/Externals/Cg/cgGL.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
@@ -71,15 +71,13 @@
 
 /* Set up for either Win32 import/export/lib. */
 #ifndef CGGL_API
-# ifdef CGGL_EXPORTS
-#  ifdef _WIN32
+# ifdef _WIN32
+#  ifdef CGGL_EXPORTS
 #   define CGGL_API __declspec(dllexport)
-#  elif defined(__GNUC__) && __GNUC__>=4
-#   define CGGL_API __attribute__ ((visibility("default")))
-#  elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#   define CGGL_API __global
-#  else
+#  elif defined (CG_LIB)
 #   define CGGL_API
+#  else
+#   define CGGL_API __declspec(dllimport)
 #  endif
 # else
 #  define CGGL_API
@@ -146,7 +144,6 @@ CGGL_API void CGGLENTRY cgGLSetOptimalOptions(CGprofile profile);
  *****************************************************************************/
 
 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);
diff --git a/Externals/Cg/cgGL_profiles.h b/Externals/Cg/cgGL_profiles.h
index c5302f1781..3a1aa9d615 100644
--- a/Externals/Cg/cgGL_profiles.h
+++ b/Externals/Cg/cgGL_profiles.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
diff --git a/Externals/Cg/cg_bindlocations.h b/Externals/Cg/cg_bindlocations.h
index 7c6219bc97..96ae8e24b5 100644
--- a/Externals/Cg/cg_bindlocations.h
+++ b/Externals/Cg/cg_bindlocations.h
@@ -2,7 +2,7 @@
 
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
diff --git a/Externals/Cg/cg_datatypes.h b/Externals/Cg/cg_datatypes.h
index 76bf9f9cfc..c26eced597 100644
--- a/Externals/Cg/cg_datatypes.h
+++ b/Externals/Cg/cg_datatypes.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
@@ -67,10 +67,6 @@
  *   
  */
 
-/*
- * ADD NEW DATA TYPES TO THE END OF THIS MACRO LIST!
- *
- */
 
 
 CG_DATATYPE_MACRO(Half,half,CG_HALF,CG_HALF,0,1,CG_PARAMETERCLASS_SCALAR)
@@ -192,5 +188,4 @@ CG_DATATYPE_MACRO(SamplerCUBEARRAY,samplerCUBEARRAY,CG_SAMPLERCUBEARRAY,CG_SAMPL
 CG_DATATYPE_MACRO(VertexShader, vertexshader, CG_VERTEXSHADER_TYPE, CG_VERTEXSHADER_TYPE, 0, 0, CG_PARAMETERCLASS_OBJECT)
 CG_DATATYPE_MACRO(PixelShader, pixelshader, CG_PIXELSHADER_TYPE, CG_PIXELSHADER_TYPE, 0, 0, CG_PARAMETERCLASS_OBJECT)
 CG_DATATYPE_MACRO(Sampler, sampler, CG_SAMPLER, CG_SAMPLER, 0, 0, CG_PARAMETERCLASS_SAMPLER)
-CG_DATATYPE_MACRO(SamplerBUF,samplerBUF,CG_SAMPLERBUF,CG_SAMPLERBUF,0,0,CG_PARAMETERCLASS_SAMPLER)
 #undef CG_DATATYPE_MACRO
diff --git a/Externals/Cg/cg_enums.h b/Externals/Cg/cg_enums.h
index c2654b6b7b..9585f9d73d 100644
--- a/Externals/Cg/cg_enums.h
+++ b/Externals/Cg/cg_enums.h
@@ -1,7 +1,7 @@
 
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
diff --git a/Externals/Cg/cg_errors.h b/Externals/Cg/cg_errors.h
index df17864fce..8f5fe67ef6 100644
--- a/Externals/Cg/cg_errors.h
+++ b/Externals/Cg/cg_errors.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
diff --git a/Externals/Cg/cg_profiles.h b/Externals/Cg/cg_profiles.h
index e29d9d21d3..bdf41fe260 100644
--- a/Externals/Cg/cg_profiles.h
+++ b/Externals/Cg/cg_profiles.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2002-2009, NVIDIA Corporation.
+ * Copyright (c) 2002-2007, NVIDIA Corporation.
  * 
  *  
  * 
@@ -89,9 +89,6 @@ 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(Generic,           generic, GENERIC, "generic", 7002,0)
 
 #undef CG_PROFILE_MACRO