diff options
| author | Kenneth Russel <[email protected]> | 2006-01-29 05:15:59 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-01-29 05:15:59 +0000 |
| commit | cd2396a8b629e78b8d75a4faec1546dac935c114 (patch) | |
| tree | c7cce37330a6f72c39c6d5ac74bc7abd26ea508b /make/stub_includes/cg | |
| parent | e76c4b083265990ae85cd90d5a108ad64457de53 (diff) | |
Updated Cg headers to 1.4 rc1-4 including in particular
cgGLRegisterStates noted as missing by user Trevidos on javagaming.org
forums
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@571 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/stub_includes/cg')
| -rw-r--r-- | make/stub_includes/cg/CG/cg.h | 1 | ||||
| -rw-r--r-- | make/stub_includes/cg/CG/cgGL.h | 3 | ||||
| -rw-r--r-- | make/stub_includes/cg/CG/cg_errors.h | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/make/stub_includes/cg/CG/cg.h b/make/stub_includes/cg/CG/cg.h index fe1cf2a75..9bc366216 100644 --- a/make/stub_includes/cg/CG/cg.h +++ b/make/stub_includes/cg/CG/cg.h @@ -224,6 +224,7 @@ CGDLL_API void cgCompileProgram(CGprogram program); CGDLL_API CGbool cgIsProgramCompiled(CGprogram program); CGDLL_API const char *cgGetProgramString(CGprogram prog, CGenum pname); CGDLL_API CGprofile cgGetProgramProfile(CGprogram prog); +CGDLL_API char const * const *cgGetProgramOptions(CGprogram prog); CGDLL_API void cgSetProgramProfile(CGprogram prog, CGprofile profile); CGDLL_API void cgSetPassProgramParameters(CGprogram); diff --git a/make/stub_includes/cg/CG/cgGL.h b/make/stub_includes/cg/CG/cgGL.h index b16861d15..f66ec0685 100644 --- a/make/stub_includes/cg/CG/cgGL.h +++ b/make/stub_includes/cg/CG/cgGL.h @@ -365,6 +365,9 @@ CGGLDLL_API GLenum cgGLGetTextureEnum(CGparameter param); CGGLDLL_API void cgGLSetManageTextureParameters(CGcontext ctx, CGbool flag); CGGLDLL_API CGbool cgGLGetManageTextureParameters(CGcontext ctx); +CGGLDLL_API void cgGLSetupSampler(CGparameter param, GLuint texobj); +CGGLDLL_API void cgGLRegisterStates(CGcontext); + #endif #ifdef __cplusplus diff --git a/make/stub_includes/cg/CG/cg_errors.h b/make/stub_includes/cg/CG/cg_errors.h index c785da252..25c120a5a 100644 --- a/make/stub_includes/cg/CG/cg_errors.h +++ b/make/stub_includes/cg/CG/cg_errors.h @@ -343,5 +343,10 @@ CG_NON_NUMERIC_PARAMETER_ERROR= CG_NON_NUMERIC_PARAMETER_ERROR, "The parameter is not of a numeric type.")*/ +CG_ARRAY_SIZE_MISMATCH_ERROR= +/*CG_ERROR_MACRO(*/53,/* + CG_ARRAY_SIZE_MISMATCH_ERROR, + "The specified array sizes are not compatible with the given array.")*/ + //#undef CG_ERROR_MACRO |