GraphicsHelperGL3_3: small fixes + autotest export

Change-Id: I3f37b88df6c3869570c0466e85e52a8e29387d92
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
index 5d2fbcc7f..b56a15dcc 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
@@ -76,6 +76,10 @@ GraphicsHelperGL3_3::GraphicsHelperGL3_3()
 {
 }
 
+GraphicsHelperGL3_3::~GraphicsHelperGL3_3()
+{
+}
+
 void GraphicsHelperGL3_3::initializeHelper(QOpenGLContext *context,
                                             QAbstractOpenGLFunctions *functions)
 {
@@ -383,6 +387,7 @@ bool GraphicsHelperGL3_3::supportsFeature(GraphicsHelperInterface::Feature featu
     case PrimitiveRestart:
     case RenderBufferDimensionRetrieval:
     case TextureDimensionRetrieval:
+    case BindableFragmentOutputs:
         return true;
     case Tessellation:
         return !m_tessFuncs.isNull();
@@ -1175,6 +1180,14 @@ UniformType GraphicsHelperGL3_3::uniformTypeFromGLType(GLenum type)
         return UniformType::IVec3;
     case GL_INT_VEC4:
         return UniformType::IVec4;
+    case GL_UNSIGNED_INT:
+        return UniformType::UInt;
+    case GL_UNSIGNED_INT_VEC2:
+        return UniformType::UIVec2;
+    case GL_UNSIGNED_INT_VEC3:
+        return UniformType::UIVec3;
+    case GL_UNSIGNED_INT_VEC4:
+        return UniformType::UIVec4;
     case GL_BOOL:
         return UniformType::Bool;
     case GL_BOOL_VEC2:
@@ -1184,8 +1197,10 @@ UniformType GraphicsHelperGL3_3::uniformTypeFromGLType(GLenum type)
     case GL_BOOL_VEC4:
         return UniformType::BVec4;
 
+    case GL_SAMPLER_BUFFER:
     case GL_SAMPLER_1D:
     case GL_SAMPLER_1D_SHADOW:
+    case GL_SAMPLER_1D_ARRAY:
     case GL_SAMPLER_2D:
     case GL_SAMPLER_2D_RECT:
     case GL_SAMPLER_2D_SHADOW:
@@ -1197,6 +1212,7 @@ UniformType GraphicsHelperGL3_3::uniformTypeFromGLType(GLenum type)
     case GL_SAMPLER_2D_MULTISAMPLE:
     case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
     case GL_SAMPLER_3D:
+    case GL_INT_SAMPLER_BUFFER:
     case GL_INT_SAMPLER_1D:
     case GL_INT_SAMPLER_2D:
     case GL_INT_SAMPLER_3D:
@@ -1205,6 +1221,7 @@ UniformType GraphicsHelperGL3_3::uniformTypeFromGLType(GLenum type)
     case GL_INT_SAMPLER_2D_ARRAY:
     case GL_INT_SAMPLER_2D_MULTISAMPLE:
     case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
+    case GL_UNSIGNED_INT_SAMPLER_BUFFER:
     case GL_UNSIGNED_INT_SAMPLER_1D:
     case GL_UNSIGNED_INT_SAMPLER_2D:
     case GL_UNSIGNED_INT_SAMPLER_3D:
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
index d78664906..8613c3c3e 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
@@ -64,10 +64,11 @@ class QOpenGLExtension_ARB_tessellation_shader;
 namespace Qt3DRender {
 namespace Render {
 
-class GraphicsHelperGL3_3 : public GraphicsHelperInterface
+class Q_AUTOTEST_EXPORT GraphicsHelperGL3_3 : public GraphicsHelperInterface
 {
 public:
     GraphicsHelperGL3_3();
+    ~GraphicsHelperGL3_3();
 
     // QGraphicHelperInterface interface
     void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;