diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-07-11 16:37:55 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-08-27 17:29:49 +0000 |
| commit | 21e3550a6ea575299e69a9065b0426dabbea5b51 (patch) | |
| tree | fcc56a959a6c4580b469fdf74bf99d0c003aec1b | |
| parent | 7cc41b9f6c18365baee5a2d08221bbd98b706e3c (diff) | |
GraphicsHelper: export for tests + fix missing types
Change-Id: I72d48a24ac2388a93166416146f05eded0688559
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl2.cpp | 7 | ||||
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl2_p.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl2.cpp b/src/render/graphicshelpers/graphicshelpergl2.cpp index e71266678..6ab69b491 100644 --- a/src/render/graphicshelpers/graphicshelpergl2.cpp +++ b/src/render/graphicshelpers/graphicshelpergl2.cpp @@ -550,10 +550,17 @@ uint GraphicsHelperGL2::uniformByteSize(const ShaderUniform &description) case GL_INT: case GL_FLOAT: + case GL_SAMPLER_1D: + case GL_SAMPLER_1D_SHADOW: case GL_SAMPLER_2D: + case GL_SAMPLER_2D_SHADOW: + case GL_SAMPLER_3D: case GL_SAMPLER_CUBE: rawByteSize = 4; break; + + default: + Q_UNREACHABLE(); } return arrayStride ? rawByteSize * arrayStride : rawByteSize; diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/graphicshelpers/graphicshelpergl2_p.h index e86db1aca..3b9c1e881 100644 --- a/src/render/graphicshelpers/graphicshelpergl2_p.h +++ b/src/render/graphicshelpers/graphicshelpergl2_p.h @@ -63,7 +63,7 @@ class QOpenGLExtension_ARB_framebuffer_object; namespace Qt3DRender { namespace Render { -class GraphicsHelperGL2 : public GraphicsHelperInterface +class Q_AUTOTEST_EXPORT GraphicsHelperGL2 : public GraphicsHelperInterface { public: GraphicsHelperGL2(); |