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

Adds CStrIntern for FXAA and dummy shader names for consistency.

Browse Source 
Reported By: Stan
This was SVN commit r27608.
This commit is contained in:
Vladislav Belov 2023-04-16 22:39:36 +00:00
parent beef529cc6
commit 3147123611
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/graphics/ShaderManager.cpp
View File

@ -27,6 +27,7 @@
#include "lib/utf8.h"
#include "ps/CLogger.h"
#include "ps/CStrIntern.h"
#include "ps/CStrInternStatic.h"
#include "ps/Filesystem.h"
#include "ps/Profile.h"
#include "ps/XML/Xeromyces.h"
@ -160,7 +161,7 @@ bool CShaderManager::LoadTechnique(CShaderTechniquePtr& tech)
// By default we assume that we have techinques for every dummy shader.
if (device->GetBackend() == Renderer::Backend::Backend::DUMMY)
{
CShaderProgramPtr shaderProgram = LoadProgram("dummy", tech->GetShaderDefines());
CShaderProgramPtr shaderProgram = LoadProgram(str_dummy.string(), tech->GetShaderDefines());
std::vector<CShaderPass> techPasses;
Renderer::Backend::SGraphicsPipelineStateDesc passPipelineStateDesc =
Renderer::Backend::MakeDefaultGraphicsPipelineStateDesc();

1
source/ps/CStrInternStatic.h
View File

@ -112,6 +112,7 @@ X(foamTex)
X(fogColor)
X(fogParams)
X(foreground_overlay)
X(fxaa)
X(grayscaleFactor)
X(hdr)
X(height)

4
source/renderer/PostprocManager.cpp
View File

@ -570,9 +570,9 @@ void CPostprocManager::UpdateAntiAliasingTechnique()
// techinques strongly depend on the graphics pipeline.
// We might use enums in future though.
constexpr std::string_view msaaPrefix{"msaa"};
if (m_AAName == "fxaa")
if (m_AAName == str_fxaa.string())
{
m_AATech = g_Renderer.GetShaderManager().LoadEffect(CStrIntern("fxaa"));
m_AATech = g_Renderer.GetShaderManager().LoadEffect(str_fxaa);
}
else if (m_AAName.size() > msaaPrefix.size() &&
std::string_view{m_AAName}.substr(0, msaaPrefix.size()) == msaaPrefix)