diff options
author | Dave Airlie <[email protected]> | 2009-03-22 12:01:21 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2009-03-22 12:01:21 +1000 |
commit | 2d26d4ac66e8c3e48b73d3e172d0e0d2a2ad31a5 (patch) | |
tree | 6b0d899db605b28e10b9b953d181b09bf40bb472 /src/glx/x11/glxclient.h | |
parent | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (diff) | |
parent | 699897e81c623e53be51fba0488f535b0a8d7761 (diff) |
Merge remote branch 'origin/master' into HEAD
Diffstat (limited to 'src/glx/x11/glxclient.h')
-rw-r--r-- | src/glx/x11/glxclient.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h index caf58bbd44a..c42e80a0e86 100644 --- a/src/glx/x11/glxclient.h +++ b/src/glx/x11/glxclient.h @@ -161,6 +161,7 @@ struct __GLXDRIdrawableRec { __GLXscreenConfigs *psc; GLenum textureTarget; __DRIdrawable *driDrawable; + GLenum textureFormat; /* EXT_texture_from_pixmap support */ }; /* |