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

Adds a warning in case ShaderManager is trying to load an ARB shader with enabled GLSL.

Browse Source 
This was SVN commit r25503.
This commit is contained in:
Vladislav Belov 2021-05-21 20:32:33 +00:00
parent 4215533ea9
commit b2d0bd9a81
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/graphics/ShaderManager.cpp
View File

@ -32,6 +32,7 @@
#include "ps/XML/Xeromyces.h"
#include "ps/XML/XMLWriter.h"
#include "renderer/Renderer.h"
#include "renderer/RenderingOptions.h"
#define USE_SHADER_XML_VALIDATION 1
@ -165,7 +166,10 @@ bool CShaderManager::NewProgram(const char* name, const CShaderDefines& baseDefi
XMBElement Root = XeroFile.GetRoot();
bool isGLSL = (Root.GetAttributes().GetNamedItem(at_type) == "glsl");
const bool isGLSL = (Root.GetAttributes().GetNamedItem(at_type) == "glsl");
if (!isGLSL && g_RenderingOptions.GetPreferGLSL())
LOGWARNING("CShaderManager::NewProgram: '%s': trying to load a non-GLSL program with enabled GLSL", name);
VfsPath vertexFile;
VfsPath fragmentFile;
CShaderDefines defines = baseDefines;