From fc03aaab577ed0116cff8057ea06ab48d1a49017 Mon Sep 17 00:00:00 2001 From: Dario Manesku Date: Thu, 21 Apr 2016 23:40:03 +0200 Subject: [PATCH] GL_ARB_texture_multisample is written against OGL 3.1. --- src/renderer_gl.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 9cb5437c6..ce4cad5a2 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -5067,10 +5067,9 @@ namespace bgfx { namespace gl ; const bool usesIUsamplers = !!bx::findIdentifierMatch(code, s_uisamplers); const bool usesTexelFetch = !!bx::findIdentifierMatch(code, s_texelFetch); - const bool usesTextureMS = !!bx::findIdentifierMatch(code, s_ARB_texture_multisample); uint32_t version = - usesIUsamplers || usesTexelFetch || usesTextureMS ? 130 + usesIUsamplers || usesTexelFetch ? 130 : usesTextureLod ? 120 : 0 ; @@ -5088,11 +5087,6 @@ namespace bgfx { namespace gl } } - if (usesTextureMS) - { - writeString(&writer, "#extension GL_ARB_texture_multisample : enable\n"); - } - if (130 <= version) { if (m_type == GL_FRAGMENT_SHADER) @@ -5208,6 +5202,11 @@ namespace bgfx { namespace gl } } + if (!!bx::findIdentifierMatch(code, s_ARB_texture_multisample)) + { + writeString(&writer, "#extension GL_ARB_texture_multisample : enable\n"); + } + if (0 != fragData) { writeStringf(&writer, "out vec4 bgfx_FragData[%d];\n", fragData);