Merge pull request #8265 from lioncash/view
OGL/ProgramShaderCache: Use std::string_view where applicable
This commit is contained in:
commit
5bad233b1a
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "VideoBackends/OGL/ProgramShaderCache.h"
|
||||
|
||||
#include <array>
|
||||
#include <atomic>
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
|
@ -17,10 +17,8 @@
|
|||
#include "Common/Logging/Log.h"
|
||||
#include "Common/MsgHandler.h"
|
||||
#include "Common/StringUtil.h"
|
||||
#include "Common/Timer.h"
|
||||
|
||||
#include "Core/ConfigManager.h"
|
||||
#include "Core/Host.h"
|
||||
|
||||
#include "VideoBackends/OGL/OGLShader.h"
|
||||
#include "VideoBackends/OGL/Render.h"
|
||||
|
@ -28,14 +26,11 @@
|
|||
#include "VideoBackends/OGL/VertexManager.h"
|
||||
|
||||
#include "VideoCommon/AsyncShaderCompiler.h"
|
||||
#include "VideoCommon/DriverDetails.h"
|
||||
#include "VideoCommon/GeometryShaderManager.h"
|
||||
#include "VideoCommon/ImageWrite.h"
|
||||
#include "VideoCommon/PixelShaderManager.h"
|
||||
#include "VideoCommon/Statistics.h"
|
||||
#include "VideoCommon/VertexLoaderManager.h"
|
||||
#include "VideoCommon/VertexShaderManager.h"
|
||||
#include "VideoCommon/VideoCommon.h"
|
||||
|
||||
namespace OGL
|
||||
{
|
||||
|
@ -267,19 +262,19 @@ void ProgramShaderCache::UploadConstants(const void* data, u32 data_size)
|
|||
ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, data_size);
|
||||
}
|
||||
|
||||
bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string& code)
|
||||
bool ProgramShaderCache::CompileComputeShader(SHADER& shader, std::string_view code)
|
||||
{
|
||||
// We need to enable GL_ARB_compute_shader for drivers that support the extension,
|
||||
// but not GLSL 4.3. Mesa is one example.
|
||||
std::string header;
|
||||
std::string full_code;
|
||||
if (g_ActiveConfig.backend_info.bSupportsComputeShaders &&
|
||||
g_ogl_config.eSupportedGLSLVersion < Glsl430)
|
||||
{
|
||||
header = "#extension GL_ARB_compute_shader : enable\n";
|
||||
full_code = "#extension GL_ARB_compute_shader : enable\n";
|
||||
}
|
||||
|
||||
std::string full_code = header + code;
|
||||
GLuint shader_id = CompileSingleShader(GL_COMPUTE_SHADER, full_code);
|
||||
full_code += code;
|
||||
const GLuint shader_id = CompileSingleShader(GL_COMPUTE_SHADER, full_code);
|
||||
if (!shader_id)
|
||||
return false;
|
||||
|
||||
|
@ -291,7 +286,7 @@ bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string&
|
|||
// original shaders aren't needed any more
|
||||
glDeleteShader(shader_id);
|
||||
|
||||
if (!CheckProgramLinkResult(shader.glprogid, &full_code, nullptr, nullptr))
|
||||
if (!CheckProgramLinkResult(shader.glprogid, full_code, {}, {}))
|
||||
{
|
||||
shader.Destroy();
|
||||
return false;
|
||||
|
@ -301,13 +296,21 @@ bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string&
|
|||
return true;
|
||||
}
|
||||
|
||||
GLuint ProgramShaderCache::CompileSingleShader(GLenum type, const std::string& code)
|
||||
GLuint ProgramShaderCache::CompileSingleShader(GLenum type, std::string_view code)
|
||||
{
|
||||
GLuint result = glCreateShader(type);
|
||||
const GLuint result = glCreateShader(type);
|
||||
|
||||
const char* src[] = {s_glsl_header.c_str(), code.c_str()};
|
||||
constexpr GLsizei num_strings = 2;
|
||||
const std::array<const char*, num_strings> src{
|
||||
s_glsl_header.data(),
|
||||
code.data(),
|
||||
};
|
||||
const std::array<GLint, num_strings> src_sizes{
|
||||
static_cast<GLint>(s_glsl_header.size()),
|
||||
static_cast<GLint>(code.size()),
|
||||
};
|
||||
|
||||
glShaderSource(result, 2, src, nullptr);
|
||||
glShaderSource(result, num_strings, src.data(), src_sizes.data());
|
||||
glCompileShader(result);
|
||||
|
||||
if (!CheckShaderCompileResult(result, type, code))
|
||||
|
@ -320,7 +323,7 @@ GLuint ProgramShaderCache::CompileSingleShader(GLenum type, const std::string& c
|
|||
return result;
|
||||
}
|
||||
|
||||
bool ProgramShaderCache::CheckShaderCompileResult(GLuint id, GLenum type, const std::string& code)
|
||||
bool ProgramShaderCache::CheckShaderCompileResult(GLuint id, GLenum type, std::string_view code)
|
||||
{
|
||||
GLint compileStatus;
|
||||
glGetShaderiv(id, GL_COMPILE_STATUS, &compileStatus);
|
||||
|
@ -374,8 +377,8 @@ bool ProgramShaderCache::CheckShaderCompileResult(GLuint id, GLenum type, const
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ProgramShaderCache::CheckProgramLinkResult(GLuint id, const std::string* vcode,
|
||||
const std::string* pcode, const std::string* gcode)
|
||||
bool ProgramShaderCache::CheckProgramLinkResult(GLuint id, std::string_view vcode,
|
||||
std::string_view pcode, std::string_view gcode)
|
||||
{
|
||||
GLint linkStatus;
|
||||
glGetProgramiv(id, GL_LINK_STATUS, &linkStatus);
|
||||
|
@ -393,12 +396,12 @@ bool ProgramShaderCache::CheckProgramLinkResult(GLuint id, const std::string* vc
|
|||
StringFromFormat("%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
|
||||
std::ofstream file;
|
||||
File::OpenFStream(file, filename, std::ios_base::out);
|
||||
if (vcode)
|
||||
file << s_glsl_header << *vcode << '\n';
|
||||
if (gcode)
|
||||
file << s_glsl_header << *gcode << '\n';
|
||||
if (pcode)
|
||||
file << s_glsl_header << *pcode << '\n';
|
||||
if (!vcode.empty())
|
||||
file << s_glsl_header << vcode << '\n';
|
||||
if (!gcode.empty())
|
||||
file << s_glsl_header << gcode << '\n';
|
||||
if (!pcode.empty())
|
||||
file << s_glsl_header << pcode << '\n';
|
||||
|
||||
file << info_log;
|
||||
file.close();
|
||||
|
@ -516,7 +519,7 @@ PipelineProgram* ProgramShaderCache::GetPipelineProgram(const GLVertexFormat* ve
|
|||
geometry_shader ? geometry_shader->GetID() : 0,
|
||||
pixel_shader ? pixel_shader->GetID() : 0};
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(s_pipeline_program_lock);
|
||||
std::lock_guard guard{s_pipeline_program_lock};
|
||||
auto iter = s_pipeline_programs.find(key);
|
||||
if (iter != s_pipeline_programs.end())
|
||||
{
|
||||
|
@ -583,10 +586,10 @@ PipelineProgram* ProgramShaderCache::GetPipelineProgram(const GLVertexFormat* ve
|
|||
if (!s_is_shared_context && vao != s_last_VAO)
|
||||
glBindVertexArray(s_last_VAO);
|
||||
|
||||
if (!ProgramShaderCache::CheckProgramLinkResult(
|
||||
prog->shader.glprogid, vertex_shader ? &vertex_shader->GetSource() : nullptr,
|
||||
geometry_shader ? &geometry_shader->GetSource() : nullptr,
|
||||
pixel_shader ? &pixel_shader->GetSource() : nullptr))
|
||||
if (!CheckProgramLinkResult(prog->shader.glprogid,
|
||||
vertex_shader ? vertex_shader->GetSource() : std::string_view{},
|
||||
geometry_shader ? geometry_shader->GetSource() : std::string_view{},
|
||||
pixel_shader ? pixel_shader->GetSource() : std::string_view{}))
|
||||
{
|
||||
prog->shader.Destroy();
|
||||
return nullptr;
|
||||
|
@ -594,7 +597,7 @@ PipelineProgram* ProgramShaderCache::GetPipelineProgram(const GLVertexFormat* ve
|
|||
}
|
||||
|
||||
// Lock to insert. A duplicate program may have been created in the meantime.
|
||||
std::lock_guard<std::mutex> guard(s_pipeline_program_lock);
|
||||
std::lock_guard guard{s_pipeline_program_lock};
|
||||
auto iter = s_pipeline_programs.find(key);
|
||||
if (iter != s_pipeline_programs.end())
|
||||
{
|
||||
|
@ -624,8 +627,8 @@ void ProgramShaderCache::ReleasePipelineProgram(PipelineProgram* prog)
|
|||
|
||||
prog->shader.Destroy();
|
||||
|
||||
std::lock_guard<std::mutex> guard(s_pipeline_program_lock);
|
||||
auto iter = s_pipeline_programs.find(prog->key);
|
||||
std::lock_guard guard{s_pipeline_program_lock};
|
||||
const auto iter = s_pipeline_programs.find(prog->key);
|
||||
ASSERT(iter != s_pipeline_programs.end() && prog == iter->second.get());
|
||||
s_pipeline_programs.erase(iter);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include <atomic>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <tuple>
|
||||
#include <string_view>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "Common/GL/GLUtil.h"
|
||||
|
@ -75,11 +75,11 @@ public:
|
|||
static void InvalidateVertexFormatIfBound(GLuint vao);
|
||||
static void InvalidateLastProgram();
|
||||
|
||||
static bool CompileComputeShader(SHADER& shader, const std::string& code);
|
||||
static GLuint CompileSingleShader(GLenum type, const std::string& code);
|
||||
static bool CheckShaderCompileResult(GLuint id, GLenum type, const std::string& code);
|
||||
static bool CheckProgramLinkResult(GLuint id, const std::string* vcode, const std::string* pcode,
|
||||
const std::string* gcode);
|
||||
static bool CompileComputeShader(SHADER& shader, std::string_view code);
|
||||
static GLuint CompileSingleShader(GLenum type, std::string_view code);
|
||||
static bool CheckShaderCompileResult(GLuint id, GLenum type, std::string_view code);
|
||||
static bool CheckProgramLinkResult(GLuint id, std::string_view vcode, std::string_view pcode,
|
||||
std::string_view gcode);
|
||||
static StreamBuffer* GetUniformBuffer();
|
||||
static u32 GetUniformBufferAlignment();
|
||||
static void UploadConstants();
|
||||
|
@ -105,9 +105,9 @@ public:
|
|||
static void ReleasePipelineProgram(PipelineProgram* prog);
|
||||
|
||||
private:
|
||||
typedef std::unordered_map<PipelineProgramKey, std::unique_ptr<PipelineProgram>,
|
||||
PipelineProgramKeyHash>
|
||||
PipelineProgramMap;
|
||||
using PipelineProgramMap =
|
||||
std::unordered_map<PipelineProgramKey, std::unique_ptr<PipelineProgram>,
|
||||
PipelineProgramKeyHash>;
|
||||
|
||||
static void CreateAttributelessVAO();
|
||||
|
||||
|
|
Loading…
Reference in New Issue