diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-24 10:49:59 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-09-23 13:30:07 +0000 |
commit | 1b2862e896e31c89459f3186b7e9fdbd64d72bdd (patch) | |
tree | 415d56e329dc4ec4c10d1782e1030800f4c48806 /recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | |
parent | a05a041900d20a730295ad02906f1a0c31b48a86 (diff) | |
download | meta-qt5-1b2862e896e31c89459f3186b7e9fdbd64d72bdd.tar.gz |
qt3d-runtime: update to ogl-runtime v2.4
Qt 3D Studio Runtime 2.x switches/upgrades to OpenGL Runtime with
version update 2.3 -> 2.4.
* Contains new 3rdparty submodule EASTL (Electronic Arts Standard
Template Library), recipe adjusted accordingly.
* format-security, examples & musl libc build issues fixed
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch')
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch new file mode 100644 index 00000000..fcf6915d --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 5 Aug 2019 14:24:44 +0300 | ||
4 | Subject: [PATCH] Fix format-security issues | ||
5 | |||
6 | format not a string literal and no format arguments [-Wformat-security] | ||
7 | |||
8 | Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7 | ||
9 | --- | ||
10 | src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++-- | ||
11 | src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++---- | ||
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
15 | index ac5b992..02046ac 100644 | ||
16 | --- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
17 | +++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
18 | @@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s | ||
19 | // check for error | ||
20 | GLenum error = m_glFunctions->glGetError(); | ||
21 | if (error != GL_NO_ERROR) { | ||
22 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
23 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
24 | QT3DS_ASSERT(false); | ||
25 | GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
26 | bufID = 0; | ||
27 | @@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj | ||
28 | // check for error | ||
29 | GLenum error = m_glFunctions->glGetError(); | ||
30 | if (error != GL_NO_ERROR) { | ||
31 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
32 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
33 | QT3DS_ASSERT(false); | ||
34 | success = false; | ||
35 | } | ||
36 | diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
37 | index 0fe6e0f..5dfe9d1 100644 | ||
38 | --- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
39 | +++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
40 | @@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla | ||
41 | } else { | ||
42 | GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID)); | ||
43 | bufID = 0; | ||
44 | - qCCritical(GL_ERROR, GLConversion::processGLError(target)); | ||
45 | + qCCritical(GL_ERROR) << GLConversion::processGLError(target); | ||
46 | } | ||
47 | } | ||
48 | |||
49 | @@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor | ||
50 | // check for error | ||
51 | GLenum error = m_glFunctions->glGetError(); | ||
52 | if (error != GL_NO_ERROR) { | ||
53 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
54 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
55 | QT3DS_ASSERT(false); | ||
56 | GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
57 | bufID = 0; | ||
58 | @@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject | ||
59 | // check for error | ||
60 | GLenum error = m_glFunctions->glGetError(); | ||
61 | if (error != GL_NO_ERROR) { | ||
62 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
63 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
64 | QT3DS_ASSERT(false); | ||
65 | success = false; | ||
66 | } | ||
67 | @@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI | ||
68 | GLenum binaryError = m_glFunctions->glGetError(); | ||
69 | if (binaryError != GL_NO_ERROR) { | ||
70 | shaderStatus = GL_FALSE; | ||
71 | - qCCritical(GL_ERROR, GLConversion::processGLError(binaryError)); | ||
72 | + qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError); | ||
73 | } | ||
74 | } | ||
75 | |||