diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-07-11 14:09:37 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-09-08 06:43:43 +0000 |
commit | 40c81d3dcfebff613222a877bef2d0a3312f4adc (patch) | |
tree | a1a3d63494fcf959d9909c60fc33d7bebe7a045b /src/render/graphicshelpers/graphicshelpergl3_3.cpp | |
parent | 6b3bee57f00d3af3374635c76eef822f3a441a82 (diff) |
GraphicsHelperGL3_3: small fixes + autotest export
Change-Id: I3f37b88df6c3869570c0466e85e52a8e29387d92
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicshelpergl3_3.cpp')
-rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_3.cpp | 17 |
1 files changed, 17 insertions, 0 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: |