wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Uses vertex attribute name only for GLSL. Fixes #6500

Browse Source 
This was SVN commit r26799.
This commit is contained in:
Vladislav Belov 2022-04-17 08:00:10 +00:00
parent 28349a2067
commit e02b402a14
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/renderer/backend/gl/ShaderProgram.cpp
View File

@ -902,6 +902,8 @@ std::unique_ptr<CShaderProgram> CShaderProgram::Create(CDevice* device, const CS
XMBElement root = XeroFile.GetRoot();
const bool isGLSL = root.GetAttributes().GetNamedItem(at_type) == "glsl";
VfsPath vertexFile;
VfsPath fragmentFile;
CShaderDefines defines = baseDefines;
@ -936,7 +938,7 @@ std::unique_ptr<CShaderProgram> CShaderProgram::Create(CDevice* device, const CS
{
const CStr streamName = attributes.GetNamedItem(at_name);
const CStr attributeName = attributes.GetNamedItem(at_attribute);
if (attributeName.empty())
if (attributeName.empty() && isGLSL)
LOGERROR("Empty attribute name in vertex shader description '%s'", vertexFile.string8().c_str());
int stream = 0;
@ -965,8 +967,11 @@ std::unique_ptr<CShaderProgram> CShaderProgram::Create(CDevice* device, const CS
else
LOGERROR("Unknown stream '%s' in vertex shader description '%s'", streamName.c_str(), vertexFile.string8().c_str());
const int attributeLocation = GetAttributeLocationFromStream(device, stream);
vertexAttribs[CStrIntern(attributeName)] = attributeLocation;
if (isGLSL)
{
const int attributeLocation = GetAttributeLocationFromStream(device, stream);
vertexAttribs[CStrIntern(attributeName)] = attributeLocation;
}
streamFlags |= stream;
}
}
@ -1014,7 +1019,7 @@ std::unique_ptr<CShaderProgram> CShaderProgram::Create(CDevice* device, const CS
}
}
if (root.GetAttributes().GetNamedItem(at_type) == "glsl")
if (isGLSL)
return CShaderProgram::ConstructGLSL(device, name, vertexFile, fragmentFile, defines, vertexAttribs, streamFlags);
else
return CShaderProgram::ConstructARB(device, vertexFile, fragmentFile, defines, vertexUniforms, fragmentUniforms, streamFlags);