real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Disables possibility to mix shader types with a single backend.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D4463
This was SVN commit r26264.
This commit is contained in:
Vladislav Belov 2022-01-28 06:34:34 +00:00
parent 01c5facdd5
commit 1e07283bac
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source/graphics/ShaderManager.cpp
View File

@ -158,11 +158,7 @@ bool CShaderManager::NewProgram(const char* name, const CShaderDefines& baseDefi
CPreprocessorWrapper preprocessor;
preprocessor.AddDefines(baseDefines);
XMBElement Root = XeroFile.GetRoot();
const bool isGLSL = (Root.GetAttributes().GetNamedItem(at_type) == "glsl");
if (!isGLSL && g_VideoMode.GetBackend() != CVideoMode::Backend::GL_ARB)
LOGWARNING("CShaderManager::NewProgram: '%s': trying to load a non-GLSL program with enabled GLSL", name);
XMBElement root = XeroFile.GetRoot();
VfsPath vertexFile;
VfsPath fragmentFile;
@ -172,7 +168,7 @@ bool CShaderManager::NewProgram(const char* name, const CShaderDefines& baseDefi
std::map<CStrIntern, int> vertexAttribs;
int streamFlags = 0;
XERO_ITER_EL(Root, Child)
XERO_ITER_EL(root, Child)
{
if (Child.GetNodeName() == el_define)
{
@ -262,7 +258,7 @@ bool CShaderManager::NewProgram(const char* name, const CShaderDefines& baseDefi
}
}
if (isGLSL)
if (root.GetAttributes().GetNamedItem(at_type) == "glsl")
program = CShaderProgramPtr(CShaderProgram::ConstructGLSL(vertexFile, fragmentFile, defines, vertexAttribs, streamFlags));
else
program = CShaderProgramPtr(CShaderProgram::ConstructARB(vertexFile, fragmentFile, defines, vertexUniforms, fragmentUniforms, streamFlags));
@ -376,9 +372,6 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
// Read some defines that influence how we pick techniques
const CRenderer::Caps& capabilities = g_Renderer.GetCapabilities();
const bool hasARB = capabilities.m_ARBProgram;
const bool hasGLSL = capabilities.m_FragmentShader && capabilities.m_VertexShader;
const bool preferGLSL = g_VideoMode.GetBackend() != CVideoMode::Backend::GL_ARB;
// Prepare the preprocessor for conditional tests
CPreprocessorWrapper preprocessor;
@ -388,11 +381,10 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
// Find all the techniques that we can use, and their preference
std::vector<std::pair<XMBElement, int>> usableTechs;
std::vector<XMBElement> usableTechs;
XERO_ITER_EL(Root, Technique)
{
int preference = 0;
bool isUsable = true;
XERO_ITER_EL(Technique, Child)
{
@ -403,18 +395,19 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
{
if (Attrs.GetNamedItem(at_shaders) == "arb")
{
if (!hasARB)
if (g_VideoMode.GetBackend() != CVideoMode::Backend::GL_ARB ||
!capabilities.m_ARBProgram)
{
isUsable = false;
}
}
else if (Attrs.GetNamedItem(at_shaders) == "glsl")
{
if (!hasGLSL)
if (g_VideoMode.GetBackend() != CVideoMode::Backend::GL ||
!(capabilities.m_FragmentShader && capabilities.m_VertexShader))
{
isUsable = false;
if (preferGLSL)
preference += 100;
else
preference -= 100;
}
}
else if (!Attrs.GetNamedItem(at_context).empty())
{
@ -426,7 +419,7 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
}
if (isUsable)
usableTechs.emplace_back(Technique, preference);
usableTechs.emplace_back(Technique);
}
if (usableTechs.empty())
@ -435,14 +428,8 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
return false;
}
// Sort by preference, tie-break on order of specification
std::stable_sort(usableTechs.begin(), usableTechs.end(),
[](const std::pair<XMBElement, int>& a, const std::pair<XMBElement, int>& b) {
return b.second < a.second;
});
CShaderDefines techDefines = baseDefines;
XERO_ITER_EL(usableTechs[0].first, Child)
XERO_ITER_EL(usableTechs[0], Child)
{
if (Child.GetNodeName() == el_define)
{
@ -458,7 +445,7 @@ bool CShaderManager::NewEffect(const char* name, const CShaderDefines& baseDefin
// TODO: we might want to implement that in a proper way via splitting passes
// and tags in different groups in XML.
std::vector<CShaderPass> techPasses;
XERO_ITER_EL(usableTechs[0].first, Child)
XERO_ITER_EL(usableTechs[0], Child)
{
if (Child.GetNodeName() == el_pass)
{

11
source/renderer/PostprocManager.cpp
View File

@ -50,6 +50,12 @@ CPostprocManager::~CPostprocManager()
Cleanup();
}
bool CPostprocManager::IsEnabled() const
{
return g_RenderingOptions.GetPostProc() &&
g_VideoMode.GetBackend() != CVideoMode::Backend::GL_ARB;
}
void CPostprocManager::Cleanup()
{
if (!m_IsInitialized) // Only cleanup if previously used
@ -773,6 +779,11 @@ CPostprocManager::~CPostprocManager()
{
}
bool CPostprocManager::IsEnabled() const
{
return false;
}
void CPostprocManager::Initialize()
{
}

3
source/renderer/PostprocManager.h
View File

@ -32,6 +32,9 @@ public:
CPostprocManager();
~CPostprocManager();
// Returns true if the the manager can be used.
bool IsEnabled() const;
// Create all buffers/textures in GPU memory and set default effect.
// @note Must be called before using in the renderer. May be called multiple times.
void Initialize();

2
source/renderer/Renderer.cpp
View File

@ -387,7 +387,7 @@ bool CRenderer::Open(int width, int height)
m->deviceCommandContext = Renderer::Backend::GL::CDeviceCommandContext::Create();
if (g_RenderingOptions.GetPostProc())
if (m->postprocManager.IsEnabled())
m->postprocManager.Initialize();
m->sceneRenderer.Initialize();

4
source/renderer/SceneRenderer.cpp
View File

@ -892,7 +892,7 @@ void CSceneRenderer::RenderSubmissions(
}
CPostprocManager& postprocManager = g_Renderer.GetPostprocManager();
if (g_RenderingOptions.GetPostProc())
if (postprocManager.IsEnabled())
{
// We have to update the post process manager with real near/far planes
// that we use for the scene rendering.
@ -974,7 +974,7 @@ void CSceneRenderer::RenderSubmissions(
ogl_WarnIfError();
}
if (g_RenderingOptions.GetPostProc())
if (postprocManager.IsEnabled())
{
if (g_Renderer.GetPostprocManager().IsMultisampleEnabled())
g_Renderer.GetPostprocManager().ResolveMultisampleFramebuffer();