diff options
| author | Jouk <joukj@tarantella.(none)> | 2007-06-08 13:38:24 +0200 |
|---|---|---|
| committer | Jouk <joukj@tarantella.(none)> | 2007-06-08 13:38:24 +0200 |
| commit | 55f8b7053065ce88296608071feed6f9540f6c0d (patch) | |
| tree | 86ac301ed5805c895985040caf56f857de017233 /src/mesa/drivers/x11/xmesaP.h | |
| parent | 518f9168862b2096278ae14a65c8c854c208e004 (diff) | |
| parent | 7b559a91028d297b34df9ec939bd4d00fad6027c (diff) | |
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/x11/xmesaP.h')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 0198886747..e3d7cf381f 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 7.1 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 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"), @@ -267,6 +267,11 @@ struct xmesa_buffer { fxMesaContext FXctx; #endif + /* GLX_EXT_texture_from_pixmap */ + GLint TextureTarget; /** GLX_TEXTURE_1D_EXT, for example */ + GLint TextureFormat; /** GLX_TEXTURE_FORMAT_RGB_EXT, for example */ + GLint TextureMipmap; /** 0 or 1 */ + struct xmesa_buffer *Next; /* Linked list pointer: */ }; |