From 5cab32dbed8d4af73a52c42249f3fed0ab9c63ce Mon Sep 17 00:00:00 2001 From: Alexey Knyazev <3479527+lexaknyazev@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:00:00 +0000 Subject: [PATCH] Sync ShaderTextureFunctionTests with upstream CTS --- .../deqp/functional/gles3/es3fShaderTextureFunctionTests.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/tests/deqp/functional/gles3/es3fShaderTextureFunctionTests.js b/sdk/tests/deqp/functional/gles3/es3fShaderTextureFunctionTests.js index b6386c96ed..890b50f889 100644 --- a/sdk/tests/deqp/functional/gles3/es3fShaderTextureFunctionTests.js +++ b/sdk/tests/deqp/functional/gles3/es3fShaderTextureFunctionTests.js @@ -1253,11 +1253,13 @@ goog.scope(function() { /** @type {tcuTexture.TextureFormat} */ var texFmt = gluTextureUtil.mapGLInternalFormat(this.m_textureSpec.format); /** @type {tcuTextureUtil.TextureFormatInfo} */ var fmtInfo = tcuTextureUtil.getTextureFormatInfo(texFmt); /** @type {Array} */ var viewportSize = this.getViewportSize(); - /** @type {boolean} */ var isProj = es3fShaderTextureFunctionTests.functionHasProj(this.m_lookupSpec.func); + /** @type {boolean} */ var useProj = es3fShaderTextureFunctionTests.functionHasProj(this.m_lookupSpec.func) && + !es3fShaderTextureFunctionTests.functionHasGrad(this.m_lookupSpec.func) && + !es3fShaderTextureFunctionTests.functionHasLod(this.m_lookupSpec.func); /** @type {boolean} */ var isAutoLod = es3fShaderTextureFunctionTests.functionHasAutoLod( this.m_isVertexCase ? gluShaderProgram.shaderType.VERTEX : gluShaderProgram.shaderType.FRAGMENT, this.m_lookupSpec.func); // LOD can vary significantly - /** @type {number} */ var proj = isProj ? + /** @type {number} */ var proj = useProj ? 1.0 / this.m_lookupSpec.minCoord[this.m_lookupSpec.func === es3fShaderTextureFunctionTests.TexFunction.TEXTUREPROJ3 ? 2 : 3] : 1.0;