aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/textureview.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:57:19 +0200
committermarha <marha@users.sourceforge.net>2014-09-02 18:57:19 +0200
commit166caebfaa2b217332a345ffb02c5b9e52f65a3d (patch)
tree2de6bdc3d44a72fda18c5d070d3902d57a0e5d4a /mesalib/src/mesa/main/textureview.c
parentdea8f13d8104872dec9243abe06f3d9e4c807ccd (diff)
parent4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff)
downloadvcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.gz
vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.bz2
vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/textureview.c')
-rw-r--r--mesalib/src/mesa/main/textureview.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/textureview.c b/mesalib/src/mesa/main/textureview.c
index b3521e219..6e86a9a44 100644
--- a/mesalib/src/mesa/main/textureview.c
+++ b/mesalib/src/mesa/main/textureview.c
@@ -536,6 +536,9 @@ _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture,
/* Adjust width, height, depth to be appropriate for new target */
switch (target) {
case GL_TEXTURE_1D:
+ height = 1;
+ break;
+
case GL_TEXTURE_3D:
break;