From 9ea37879e8c0ecc8a8973b3d5194d4dc12f21360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Fri, 27 Feb 2015 13:56:05 -0800 Subject: [PATCH] Make non-texture filterable textures complete. Make sure that even non-texture filterable format textures are complete before calling glCopyImage. Bug: 19543570 Change-Id: I84a7b303a510afc2535ac5960ddd41e0c056a981 --- modules/gles31/functional/es31fCopyImageTests.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/gles31/functional/es31fCopyImageTests.cpp b/modules/gles31/functional/es31fCopyImageTests.cpp index 2700ace..6015faa 100644 --- a/modules/gles31/functional/es31fCopyImageTests.cpp +++ b/modules/gles31/functional/es31fCopyImageTests.cpp @@ -606,6 +606,16 @@ void genTextureImage (const glw::Functions& gl, } } + gl.texParameteri(info.getTarget(), GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl.texParameteri(info.getTarget(), GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + if (info.getTarget() == GL_TEXTURE_3D) + gl.texParameteri(info.getTarget(), GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + + gl.texParameteri(info.getTarget(), GL_TEXTURE_MIN_FILTER, GL_NEAREST); + gl.texParameteri(info.getTarget(), GL_TEXTURE_MAG_FILTER, GL_NEAREST); + GLU_EXPECT_NO_ERROR(gl.getError(), "Setting texture parameters failed"); + gl.bindTexture(info.getTarget(), 0); GLU_EXPECT_NO_ERROR(gl.getError(), "Unbinding texture failed."); } @@ -728,12 +738,12 @@ int sumComponents (const IVec3& v) } void copyImageData (vector >& dstImageData, - const ImageInfo& dstImageInfo, + const ImageInfo& dstImageInfo, int dstLevel, const IVec3& dstPos, const vector >& srcImageData, - const ImageInfo& srcImageInfo, + const ImageInfo& srcImageInfo, int srcLevel, const IVec3& srcPos, -- 2.7.4