From db55d0b4ba6d56aac7bc79deef9e21acd71e9e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Ker=C3=A4nen?= <pasi.keranen@digia.com> Date: Thu, 7 May 2015 09:49:07 +0300 Subject: [PATCH] Fixes infinite reqursion when calling copyTexSubImage2D. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit copyTexSubImage2D method was calling itself rather than the intended glCopyTexSubImage2D method. Change-Id: I3252dc0ea786c5c6d0d2be17a4ab593f29fad0e9 Task-number: QTBUG-45967 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> --- src/imports/qtcanvas3d/context3d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp index 849d8c6..b3a99b4 100644 --- a/src/imports/qtcanvas3d/context3d.cpp +++ b/src/imports/qtcanvas3d/context3d.cpp @@ -826,7 +826,7 @@ void CanvasContext::copyTexSubImage2D(glEnums target, int level, if (!isValidTextureBound(target, __FUNCTION__)) return; - copyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); + glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); logAllGLErrors(__FUNCTION__); } -- GitLab