diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-26 05:22:17 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-26 05:22:17 +0000 |
| commit | ea4fe661d7f3a95d9db17e1475076f1badf8e1a6 (patch) | |
| tree | ffc663f1a02dea07254e08620f8ad872fb1a3e20 /src/mesa/main/texobj.h | |
| parent | 4cbd16ed3ffecd743b4921fab3a65f8510d151c9 (diff) | |
merge from texman branch
Diffstat (limited to 'src/mesa/main/texobj.h')
| -rw-r--r-- | src/mesa/main/texobj.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index d00bf70a0d..ac66ac69d3 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -5,9 +5,9 @@ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 6.5 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -41,6 +41,9 @@ /*@{*/ extern struct gl_texture_object * +_mesa_lookup_texture(GLcontext *ctx, GLuint id); + +extern struct gl_texture_object * _mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target ); extern void |