From 813a40c3ee4ee38428a8c31c232c85392049b9b5 Mon Sep 17 00:00:00 2001
From: Pasi Keranen <pasi.keranen@digia.com>
Date: Wed, 18 Mar 2015 10:36:56 +0200
Subject: [PATCH] Fixes vertexAttribPointer type checking.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes QTBUG-45070. Adds the SHORT enumeration
as accepted type value.

Change-Id: Ibd8ddd6c796320ebc233f0b667250536dd013e74
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
 src/context3d.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/context3d.cpp b/src/context3d.cpp
index b573c17..ac6cf11 100644
--- a/src/context3d.cpp
+++ b/src/context3d.cpp
@@ -140,7 +140,6 @@ void CanvasContext::setCanvas(Canvas *canvas)
             disconnect(m_canvas, &QQuickItem::heightChanged, this, 0);
         }
 
-
         m_canvas = canvas;
         emit canvasChanged(canvas);
 
@@ -4073,6 +4072,7 @@ void CanvasContext::uniformMatrix2fva(CanvasUniformLocation *uniformLocation, bo
  * \list
  * \li \c{Context3D.BYTE}
  * \li \c{Context3D.UNSIGNED_BYTE}
+ * \li \c{Context3D.SHORT}
  * \li \c{Context3D.UNSIGNED_SHORT}
  * \li \c{Context3D.FLOAT}
  * \endlist
@@ -4123,6 +4123,7 @@ void CanvasContext::vertexAttribPointer(int indx, int size, glEnums type,
     case BYTE:
     case UNSIGNED_BYTE:
         break;
+    case SHORT:
     case UNSIGNED_SHORT:
         if (offset % 2 != 0) {
             qCWarning(canvas3drendering).nospace() << "Context3D::" << __FUNCTION__
-- 
GitLab