Finished downgrade to Cg 2.0.0016

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2519 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-03-02 09:43:37 +00:00
parent 76cbdf8694
commit 63590b8879
9 changed files with 30 additions and 20 deletions

17
Externals/Cg/cg.h vendored
View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright (c) 2002-2007, NVIDIA Corporation. * Copyright (c) 2002-2008, NVIDIA Corporation.
* *
* *
* *
@ -74,15 +74,18 @@
# endif # endif
#endif /* _WIN32 */ #endif /* _WIN32 */
/* Set up for either Win32 import/export/lib. */ /* Set up CG_API for Win32 dllexport or gcc visibility */
#ifndef CG_API #ifndef CG_API
# ifdef _WIN32 # ifdef CG_EXPORTS
# ifdef CG_EXPORTS # ifdef _WIN32
# define CG_API __declspec(dllexport) # define CG_API __declspec(dllexport)
# elif defined (CG_LIB) # elif defined(__GNUC__) && __GNUC__>=4
# define CG_API # define CG_API __attribute__ ((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define CG_API __global
# else # else
# define CG_API __declspec(dllimport) # define CG_API
# endif # endif
# else # else
# define CG_API # define CG_API

View File

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

14
Externals/Cg/cgGL.h vendored
View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright (c) 2002-2007, NVIDIA Corporation. * Copyright (c) 2002-2008, NVIDIA Corporation.
* *
* *
* *
@ -71,13 +71,15 @@
/* Set up for either Win32 import/export/lib. */ /* Set up for either Win32 import/export/lib. */
#ifndef CGGL_API #ifndef CGGL_API
# ifdef _WIN32 # ifdef CGGL_EXPORTS
# ifdef CGGL_EXPORTS # ifdef _WIN32
# define CGGL_API __declspec(dllexport) # define CGGL_API __declspec(dllexport)
# elif defined (CG_LIB) # elif defined(__GNUC__) && __GNUC__>=4
# define CGGL_API # define CGGL_API __attribute__ ((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define CGGL_API __global
# else # else
# define CGGL_API __declspec(dllimport) # define CGGL_API
# endif # endif
# else # else
# define CGGL_API # define CGGL_API

View File

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

View File

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

View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright (c) 2002-2007, NVIDIA Corporation. * Copyright (c) 2002-2008, NVIDIA Corporation.
* *
* *
* *
@ -67,6 +67,10 @@
* *
*/ */
/*
* 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) CG_DATATYPE_MACRO(Half,half,CG_HALF,CG_HALF,0,1,CG_PARAMETERCLASS_SCALAR)
@ -188,4 +192,5 @@ 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(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(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(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 #undef CG_DATATYPE_MACRO

View File

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

View File

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

View File

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