octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl_shader_cache: Address review commentaries

This commit is contained in:
ReinUsesLisp 2019-07-15 16:29:25 -03:00
parent bbecd13697
commit 56bca83bde
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -727,6 +727,8 @@ void RasterizerOpenGL::DispatchCompute(GPUVAddr code_addr) {
SetupComputeConstBuffers(kernel); SetupComputeConstBuffers(kernel);
SetupComputeGlobalMemory(kernel); SetupComputeGlobalMemory(kernel);
// TODO(Rodrigo): Bind images and samplers
buffer_cache.Unmap(); buffer_cache.Unmap();
bind_ubo_pushbuffer.Bind(); bind_ubo_pushbuffer.Bind();

11
src/video_core/renderer_opengl/gl_shader_cache.cpp
View File

@ -123,9 +123,6 @@ ProgramType GetProgramType(Maxwell::ShaderProgram program) {
/// Calculates the size of a program stream /// Calculates the size of a program stream
std::size_t CalculateProgramSize(const GLShader::ProgramCode& program) { std::size_t CalculateProgramSize(const GLShader::ProgramCode& program) {
if (program.empty()) {
return 0;
}
constexpr std::size_t start_offset = 10; constexpr std::size_t start_offset = 10;
// This is the encoded version of BRA that jumps to itself. All Nvidia // This is the encoded version of BRA that jumps to itself. All Nvidia
// shaders end with one. // shaders end with one.
@ -299,8 +296,8 @@ CachedShader::CachedShader(const ShaderParameters& params, ProgramType program_t
Shader CachedShader::CreateStageFromMemory(const ShaderParameters& params, Shader CachedShader::CreateStageFromMemory(const ShaderParameters& params,
Maxwell::ShaderProgram program_type, Maxwell::ShaderProgram program_type,
const ProgramCode& program_code, ProgramCode&& program_code,
const ProgramCode& program_code_b) { ProgramCode&& program_code_b) {
const auto code_size{CalculateProgramSize(program_code)}; const auto code_size{CalculateProgramSize(program_code)};
const auto code_size_b{CalculateProgramSize(program_code_b)}; const auto code_size_b{CalculateProgramSize(program_code_b)};
auto result{ auto result{
@ -327,7 +324,7 @@ Shader CachedShader::CreateStageFromCache(const ShaderParameters& params,
} }
Shader CachedShader::CreateKernelFromMemory(const ShaderParameters& params, Shader CachedShader::CreateKernelFromMemory(const ShaderParameters& params,
const ProgramCode& code) { ProgramCode&& code) {
auto result{CreateProgram(params.device, ProgramType::Compute, code, {})}; auto result{CreateProgram(params.device, ProgramType::Compute, code, {})};
const auto code_size{CalculateProgramSize(code)}; const auto code_size{CalculateProgramSize(code)};
@ -683,7 +680,7 @@ Shader ShaderCacheOpenGL::GetComputeKernel(GPUVAddr code_addr) {
} }
// No kernel found - create a new one // No kernel found - create a new one
const auto code{GetShaderCode(memory_manager, code_addr, host_ptr)}; auto code{GetShaderCode(memory_manager, code_addr, host_ptr)};
const auto unique_identifier{GetUniqueIdentifier(ProgramType::Compute, code, {})}; const auto unique_identifier{GetUniqueIdentifier(ProgramType::Compute, code, {})};
const auto cpu_addr{*memory_manager.GpuToCpuAddress(code_addr)}; const auto cpu_addr{*memory_manager.GpuToCpuAddress(code_addr)};
const ShaderParameters params{disk_cache, precompiled_programs, device, cpu_addr, const ShaderParameters params{disk_cache, precompiled_programs, device, cpu_addr,

6
src/video_core/renderer_opengl/gl_shader_cache.h
View File

@ -55,14 +55,14 @@ class CachedShader final : public RasterizerCacheObject {
public: public:
static Shader CreateStageFromMemory(const ShaderParameters& params, static Shader CreateStageFromMemory(const ShaderParameters& params,
Maxwell::ShaderProgram program_type, Maxwell::ShaderProgram program_type,
const ProgramCode& program_code, ProgramCode&& program_code,
const ProgramCode& program_code_b); ProgramCode&& program_code_b);
static Shader CreateStageFromCache(const ShaderParameters& params, static Shader CreateStageFromCache(const ShaderParameters& params,
Maxwell::ShaderProgram program_type, Maxwell::ShaderProgram program_type,
GLShader::ProgramResult result); GLShader::ProgramResult result);
static Shader CreateKernelFromMemory(const ShaderParameters& params, const ProgramCode& code); static Shader CreateKernelFromMemory(const ShaderParameters& params, ProgramCode&& code);
static Shader CreateKernelFromCache(const ShaderParameters& params, static Shader CreateKernelFromCache(const ShaderParameters& params,
GLShader::ProgramResult result); GLShader::ProgramResult result);

6
src/video_core/renderer_opengl/gl_shader_util.cpp
View File

@ -11,7 +11,7 @@
namespace OpenGL::GLShader { namespace OpenGL::GLShader {
namespace { namespace {
constexpr const char* GetStageDebugName(GLenum type) { const char* GetStageDebugName(GLenum type) {
switch (type) { switch (type) {
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER:
return "vertex"; return "vertex";
@ -21,9 +21,9 @@ constexpr const char* GetStageDebugName(GLenum type) {
return "fragment"; return "fragment";
case GL_COMPUTE_SHADER: case GL_COMPUTE_SHADER:
return "compute"; return "compute";
default:
UNREACHABLE();
} }
UNIMPLEMENTED();
return "unknown";
} }
} // Anonymous namespace } // Anonymous namespace