From ee0e17ad4b72ae6363579315ed77a42a2daa90de Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 18 Oct 2024 10:55:14 -0500 Subject: [PATCH] opengl-es-cts: Fix transform feedback issue patch [YOCIMX-8439] Signed-off-by: Tom Hochstein --- ...2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch} | 0 .../0003-Fix-transform-feedback-issue.patch | 44 +++++++++++++++++++ .../vk-gl-cts/opengl-es-cts_3.2.9.3.bbappend | 3 +- 3 files changed, 46 insertions(+), 1 deletion(-) rename meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/{0001-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch => 0002-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch} (100%) create mode 100644 meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0003-Fix-transform-feedback-issue.patch diff --git a/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch b/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0002-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch similarity index 100% rename from meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch rename to meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0002-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch diff --git a/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0003-Fix-transform-feedback-issue.patch b/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0003-Fix-transform-feedback-issue.patch new file mode 100644 index 0000000000..ff915d03ef --- /dev/null +++ b/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts/0003-Fix-transform-feedback-issue.patch @@ -0,0 +1,44 @@ +From 9fe0cbd72e1e26a8f8fd95b060cf5d20448e1244 Mon Sep 17 00:00:00 2001 +From: Shufen Ma +Date: Sun, 28 Apr 2024 16:33:53 +0800 +Subject: [PATCH] Fix transform feedback issue + +Test deleted_output.buffer_transform_feedback intends to test +that when a buffer is detached from a transform feedback object, +and transform feedback is performed again, the buffer with same +buffer name will not be affected. However, glBeginTransformFeedback +should return GL_INVALID_OPERATION if any binding point used in +transform feedback mode does not have a buffer object bound per +spec. This patch captures this error and early out. + +Affected tests: +dEQP-GLES3.functional.lifetime.* + +VK-GL-CTS issue: 5086 + +Components: AOSP +Change-Id: I1513a425f054a51e422007314f3a42a9b901e873 + +Upstream-Status: Backport [https://github.com/KhronosGroup/VK-GL-CTS/commit/261b2928759208b1ff7623c51b8c754c592b5431] +--- + modules/gles3/functional/es3fLifetimeTests.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/gles3/functional/es3fLifetimeTests.cpp b/modules/gles3/functional/es3fLifetimeTests.cpp +index 3909173c6..30dad0009 100644 +--- a/modules/gles3/functional/es3fLifetimeTests.cpp ++++ b/modules/gles3/functional/es3fLifetimeTests.cpp +@@ -141,7 +141,11 @@ void ScaleProgram::draw (GLuint vao, GLfloat scale, bool tf, Surface* dst) + gl.uniform1f(m_scaleLoc, scale); + + if (tf) ++ { + gl.beginTransformFeedback(GL_TRIANGLES); ++ if (gl.getError() == GL_INVALID_OPERATION) ++ return ; ++ } + GLU_CHECK_CALL_ERROR(gl.drawArrays(GL_TRIANGLES, 0, 3), gl.getError()); + if (tf) + gl.endTransformFeedback(); +-- +2.34.1 diff --git a/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bbappend b/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bbappend index acadc17acc..fde59d5a83 100644 --- a/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bbappend +++ b/meta-imx-sdk/dynamic-layers/openembedded-layer/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bbappend @@ -2,7 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://0001-MGS-4031-Report-NotSupported-for-OpenVG-tests-on-non.patch \ - file://0001-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch" + file://0002-CL489625-escts-3.2.8-Fix-escts3.2.8-fail-on-8mm-boar.patch \ + file://0003-Fix-transform-feedback-issue.patch" PACKAGECONFIG ?= "egl ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"