diff options
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/Qt3DSRenderShaderProgram.h | 4 | ||||
| -rw-r--r-- | src/render/backends/Qt3DSRenderBackend.h | 4 | ||||
| -rw-r--r-- | src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 | ||||
| -rw-r--r-- | src/render/backends/gl/Qt3DSOpenGLExtensions.h | 2 | ||||
| -rw-r--r-- | src/render/backends/gl/Qt3DSOpenGLUtil.h | 4 | ||||
| -rw-r--r-- | src/render/backends/gl/Qt3DSRenderBackendGL3.cpp | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/render/Qt3DSRenderShaderProgram.h b/src/render/Qt3DSRenderShaderProgram.h index ed8c677..5ad3f06 100644 --- a/src/render/Qt3DSRenderShaderProgram.h +++ b/src/render/Qt3DSRenderShaderProgram.h @@ -106,7 +106,7 @@ namespace render { NVConstDataRef<QT3DSI8> fragmentShaderSource, bool binaryProgram = false); /** - * @brief create tesselation control shader + * @brief create tessellation control shader * * @param[in] context Pointer to render context * @param[in] tessControlShaderSource Tessellation control shader source code @@ -120,7 +120,7 @@ namespace render { bool binaryProgram = false); /** - * @brief create tesselation evaluation shader + * @brief create tessellation evaluation shader * * @param[in] context Pointer to render context * @param[in] tessEvaluationShaderSource Tessellation evaluation shader source code diff --git a/src/render/backends/Qt3DSRenderBackend.h b/src/render/backends/Qt3DSRenderBackend.h index 4e9e177..226e0b7 100644 --- a/src/render/backends/Qt3DSRenderBackend.h +++ b/src/render/backends/Qt3DSRenderBackend.h @@ -73,10 +73,10 @@ namespace render { typedef struct _NVRenderBackendVertexShaderObject *NVRenderBackendVertexShaderObject; /// opaque fragment shader object handle typedef struct _NVRenderBackendFragmentShaderObject *NVRenderBackendFragmentShaderObject; - /// opaque tesselation control shader object handle + /// opaque tessellation control shader object handle typedef struct _NVRenderBackendTessControlShaderObject *NVRenderBackendTessControlShaderObject; - /// opaque tesselation evaluation shader object handle + /// opaque tessellation evaluation shader object handle typedef struct _NVRenderBackendTessEvaluationShaderObject *NVRenderBackendTessEvaluationShaderObject; /// opaque geometry shader object handle diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp index 1db51ef..54d8d5d 100644 --- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp +++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp @@ -42,13 +42,13 @@ #if defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2_ANGLE) #define GL_CALL_TIMER_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); -#define GL_CALL_TESSELATION_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); +#define GL_CALL_TESSELLATION_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); #define GL_CALL_MULTISAMPLE_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); #define GL_CALL_EXTRA_FUNCTION(x) m_glExtraFunctions->x; RENDER_LOG_ERROR_PARAMS(x); #define GL_CALL_EXTENSION_FUNCTION(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); #else #define GL_CALL_TIMER_EXT(x) -#define GL_CALL_TESSELATION_EXT(x) +#define GL_CALL_TESSELLATION_EXT(x) #define GL_CALL_MULTISAMPLE_EXT(x) #define GL_CALL_EXTRA_FUNCTION(x) m_glExtraFunctions->x; RENDER_LOG_ERROR_PARAMS(x); #define GL_CALL_EXTENSION_FUNCTION(x) diff --git a/src/render/backends/gl/Qt3DSOpenGLExtensions.h b/src/render/backends/gl/Qt3DSOpenGLExtensions.h index c9ba76a..e79fe1b 100644 --- a/src/render/backends/gl/Qt3DSOpenGLExtensions.h +++ b/src/render/backends/gl/Qt3DSOpenGLExtensions.h @@ -134,7 +134,7 @@ class Qt3DSOpenGLES2Extensions : public Qt3DSOpenGLExtensions public: Qt3DSOpenGLES2Extensions(); - // tesselation shader + // tessellation shader void glPatchParameteriEXT(GLenum pname, GLint value); // timer diff --git a/src/render/backends/gl/Qt3DSOpenGLUtil.h b/src/render/backends/gl/Qt3DSOpenGLUtil.h index 32f7dad..47f4230 100644 --- a/src/render/backends/gl/Qt3DSOpenGLUtil.h +++ b/src/render/backends/gl/Qt3DSOpenGLUtil.h @@ -1757,7 +1757,7 @@ namespace render { return NVRenderClearFlags(retval); } - static GLenum fromDrawModeToGL(NVRenderDrawMode::Enum value, bool inTesselationSupported) + static GLenum fromDrawModeToGL(NVRenderDrawMode::Enum value, bool inTessellationSupported) { switch (value) { case NVRenderDrawMode::Points: @@ -1775,7 +1775,7 @@ namespace render { case NVRenderDrawMode::Triangles: return GL_TRIANGLES; case NVRenderDrawMode::Patches: - return (inTesselationSupported) ? GL_PATCHES : GL_TRIANGLES; + return (inTessellationSupported) ? GL_PATCHES : GL_TRIANGLES; default: break; } diff --git a/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp b/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp index e5caf5e..4e637da 100644 --- a/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp +++ b/src/render/backends/gl/Qt3DSRenderBackendGL3.cpp @@ -43,10 +43,10 @@ #if defined(QT_OPENGL_ES) #define GL_CALL_TIMER_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); -#define GL_CALL_TESSELATION_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); +#define GL_CALL_TESSELLATION_EXT(x) m_qt3dsExtensions->x; RENDER_LOG_ERROR_PARAMS(x); #else #define GL_CALL_TIMER_EXT(x) m_timerExtension->x; RENDER_LOG_ERROR_PARAMS(x); -#define GL_CALL_TESSELATION_EXT(x) m_tessellationShader->x; RENDER_LOG_ERROR_PARAMS(x); +#define GL_CALL_TESSELLATION_EXT(x) m_tessellationShader->x; RENDER_LOG_ERROR_PARAMS(x); #define GL_CALL_MULTISAMPLE_EXT(x) m_multiSample->x; RENDER_LOG_ERROR_PARAMS(x); #endif @@ -408,9 +408,9 @@ namespace render { && m_pCurrentMiscState->m_PatchVertexCount != inputAssembler->m_PatchVertexCount) { m_pCurrentMiscState->m_PatchVertexCount = inputAssembler->m_PatchVertexCount; #if defined(QT_OPENGL_ES) - GL_CALL_TESSELATION_EXT(glPatchParameteriEXT(GL_PATCH_VERTICES, inputAssembler->m_PatchVertexCount)); + GL_CALL_TESSELLATION_EXT(glPatchParameteriEXT(GL_PATCH_VERTICES, inputAssembler->m_PatchVertexCount)); #else - GL_CALL_TESSELATION_EXT(glPatchParameteri(GL_PATCH_VERTICES, inputAssembler->m_PatchVertexCount)); + GL_CALL_TESSELLATION_EXT(glPatchParameteri(GL_PATCH_VERTICES, inputAssembler->m_PatchVertexCount)); #endif } |