mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gl_FragColor for example 41

Browse Source 
Support gl_FragColor with glsl fragment shaders with version 430. (Fixes example 41 using opengl)
This commit is contained in:
kingscallop 2019-09-01 21:15:20 +01:00 committed by Бранимир Караџић
parent fe045d0c98
commit 0c90be66d0
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/renderer_gl.cpp
View File

@ -5346,8 +5346,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
if (0 != m_id)
{
if (GL_COMPUTE_SHADER != m_type
&& 0 != bx::strCmp(code, "#version 430", 12) )
if (GL_COMPUTE_SHADER != m_type)
{
int32_t tempLen = code.getLength() + (4<<10);
char* temp = (char*)alloca(tempLen);
@ -5578,12 +5577,11 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
: 120
;
if (0 != version)
{
bx::write(&writer, &err, "#version %d\n", version);
}
version = 0 == bx::strCmp(code, "#version 430", 12) ? 430 : version;
if (usesTextureLod)
bx::write(&writer, &err, "#version %d\n", version);
if (430 > version && usesTextureLod)
{
if (m_type == GL_FRAGMENT_SHADER)
{
@ -5651,14 +5649,17 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
if (130 <= version)
{
if (m_type == GL_FRAGMENT_SHADER)
if (430 > version)
{
bx::write(&writer, "#define varying in\n");
}
else
{
bx::write(&writer, "#define attribute in\n");
bx::write(&writer, "#define varying out\n");
if (m_type == GL_FRAGMENT_SHADER)
{
bx::write(&writer, "#define varying in\n");
}
else
{
bx::write(&writer, "#define attribute in\n");
bx::write(&writer, "#define varying out\n");
}
}
uint32_t fragData = 0;
@ -5680,7 +5681,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
bx::write(&writer, &err, "out vec4 bgfx_FragData[%d];\n", fragData);
bx::write(&writer, "#define gl_FragData bgfx_FragData\n");
}
else
else if (!bx::findIdentifierMatch(code, "gl_FragColor").isEmpty() )
{
bx::write(&writer, "out vec4 bgfx_FragColor;\n");
bx::write(&writer, "#define gl_FragColor bgfx_FragColor\n");
@ -5717,7 +5718,16 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
);
}
bx::write(&writer, code);
if (version == 430)
{
int32_t verLen = bx::strLen("#version 430\n");
bx::write(&writer, code.getPtr()+verLen, code.getLength()-verLen);
}
else
{
bx::write(&writer, code);
}
bx::write(&writer, '\0');
}
else if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL >= 31)
@ -5834,7 +5844,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
code.set(temp);
}
else if (GL_COMPUTE_SHADER == m_type)
else // GL_COMPUTE_SHADER
{
int32_t codeLen = (int32_t)bx::strLen(code);
int32_t tempLen = codeLen + (4<<10);
@ -5854,7 +5864,8 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
"#define textureCubeGrad textureGrad\n"
);
bx::write(&writer, code.getPtr()+bx::strLen("#version 430"), codeLen);
int32_t verLen = bx::strLen("#version 430\n");
bx::write(&writer, code.getPtr()+verLen, codeLen-verLen);
bx::write(&writer, '\0');
code = temp;