diff options
author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
tree | 18dc73394bd3921415b57b5847f03a9753374e99 /mesalib/src/gallium/auxiliary/util/u_vbuf.h | |
parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_vbuf.h')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_vbuf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf.h b/mesalib/src/gallium/auxiliary/util/u_vbuf.h index 0f8227164..a608184e5 100644 --- a/mesalib/src/gallium/auxiliary/util/u_vbuf.h +++ b/mesalib/src/gallium/auxiliary/util/u_vbuf.h @@ -28,9 +28,9 @@ #ifndef U_VBUF_H #define U_VBUF_H -/* This module builds upon u_upload_mgr and translate_cache and takes care of - * user buffer uploads and vertex format fallbacks. It's designed - * for the drivers which don't always use the Draw module. (e.g. for HWTCL) +/* This module takes care of user buffer uploads and vertex format fallbacks. + * It's designed for the drivers which don't want to use the Draw module. + * There is a more detailed description at the beginning of the .c file. */ #include "pipe/p_context.h" |