diff options
Diffstat (limited to 'src/render/graphicshelpers/graphicshelpergl3_p.h')
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_p.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_p.h b/src/render/graphicshelpers/graphicshelpergl3_p.h index 721078130..3cc58bd26 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_p.h +++ b/src/render/graphicshelpers/graphicshelpergl3_p.h @@ -77,7 +77,6 @@ public: void bindFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE; void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE; void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE; - void bindUniform(const QVariant &v, const ShaderUniform &description) Q_DECL_OVERRIDE; void blendEquation(GLenum mode) Q_DECL_OVERRIDE; void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE; void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE; @@ -122,6 +121,33 @@ public: void useProgram(GLuint programId) Q_DECL_OVERRIDE; void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE; + void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + + void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE; + void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE; + void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE; + void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE; + + void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE; + void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE; + void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE; + void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE; + + void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE; + + UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE; + private: QOpenGLFunctions_3_2_Core *m_funcs; QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs; |