mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from dariomanesku/master 

GL_ARB_texture_multisample is written against OGL 3.1.
This commit is contained in:
Branimir Karadžić 2016-04-21 18:05:35 -07:00
parent 93f7fcbfec fc03aaab57
commit b2c59cf949
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/renderer_gl.cpp
View File

@ -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);