diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-05 20:17:28 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-05 20:17:28 +1100 |
| commit | da49d0adb707383f2075fada59d17a0a45d44955 (patch) | |
| tree | 14debd11aeecf4b06c447e175bd2a60d5019f1a5 /src | |
| parent | 25483001e50d52c4fda8d77a13b4b8a28b7bde3a (diff) | |
| download | qtlocation-mapboxgl-da49d0adb707383f2075fada59d17a0a45d44955.tar.gz | |
Workaround for GL extension. Need to come back to this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/renderer/painter_prerender.cpp | 2 | ||||
| -rw-r--r-- | src/renderer/prerendered_texture.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/renderer/painter_prerender.cpp b/src/renderer/painter_prerender.cpp index f38470530b..22a2be9b64 100644 --- a/src/renderer/painter_prerender.cpp +++ b/src/renderer/painter_prerender.cpp @@ -10,7 +10,7 @@ void Painter::preparePrerender(RasterBucket &bucket) { glDisable(GL_STENCIL_TEST); // Render the actual tile. -#if GL_EXT_discard_framebuffer +#if GL_EXT_discard_framebuffer && !__ANDROID__ const GLenum discards[] = {GL_COLOR_ATTACHMENT0}; glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards); #endif diff --git a/src/renderer/prerendered_texture.cpp b/src/renderer/prerendered_texture.cpp index adb7a59105..0b8b9a386c 100644 --- a/src/renderer/prerendered_texture.cpp +++ b/src/renderer/prerendered_texture.cpp @@ -117,7 +117,7 @@ void PrerenderedTexture::blur(Painter& painter, uint16_t passes) { for (int i = 0; i < passes; i++) { // Render horizontal glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, secondary_texture, 0); -#if GL_EXT_discard_framebuffer +#if GL_EXT_discard_framebuffer && !__ANDROID__ const GLenum discards[] = { GL_COLOR_ATTACHMENT0 }; glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards); #endif @@ -132,7 +132,7 @@ void PrerenderedTexture::blur(Painter& painter, uint16_t passes) { // Render vertical glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, original_texture, 0); -#if GL_EXT_discard_framebuffer +#if GL_EXT_discard_framebuffer && !__ANDROID__ glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards); #endif glClear(GL_COLOR_BUFFER_BIT); |