diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
| commit | 19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch) | |
| tree | 0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/gallium/auxiliary/util/u_inlines.h | |
| parent | 480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff) | |
| parent | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff) | |
| download | vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2 vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 9 nov 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_inlines.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_inlines.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_inlines.h b/mesalib/src/gallium/auxiliary/util/u_inlines.h index 3d68cf540..6ef5fecc6 100644 --- a/mesalib/src/gallium/auxiliary/util/u_inlines.h +++ b/mesalib/src/gallium/auxiliary/util/u_inlines.h @@ -523,6 +523,9 @@ util_pipe_tex_to_tgsi_tex(enum pipe_texture_target pipe_tex_target, return nr_samples > 1 ? TGSI_TEXTURE_2D_ARRAY_MSAA : TGSI_TEXTURE_2D_ARRAY; + case PIPE_TEXTURE_CUBE_ARRAY: + return TGSI_TEXTURE_CUBE_ARRAY; + default: assert(0 && "unexpected texture target"); return TGSI_TEXTURE_UNKNOWN; |