diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
| commit | e2e1bdced7e09e39fed613dae1f2f3096cb18118 (patch) | |
| tree | 63c7066c79d1053c7656b6175e22e2ced6f11e01 /mesalib/src/glsl/glsl_types.h | |
| parent | cc96d00cae473f472e371328ce8dc572ad258073 (diff) | |
| parent | 5cfbe97cd797d8f78ece208bb5114704b83d8aab (diff) | |
| download | vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.gz vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.bz2 vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_out.c
libxcb/src/xcb_util.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/include/misc.h
xorg-server/os/connection.c
Diffstat (limited to 'mesalib/src/glsl/glsl_types.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h index 4ac90118b..2997c9311 100644 --- a/mesalib/src/glsl/glsl_types.h +++ b/mesalib/src/glsl/glsl_types.h @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> +#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */ #ifdef __cplusplus extern "C" { @@ -354,6 +355,11 @@ struct glsl_type { bool contains_sampler() const; /** + * Get the Mesa texture target index for a sampler type. + */ + gl_texture_index sampler_index() const; + + /** * Query whether or not a type is an array */ bool is_array() const |