yuzu-emu/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-30 20:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

renderer_opengl: State track compute assembly programs

Browse Source
This commit is contained in:
ReinUsesLisp 2021-05-20 16:59:05 -03:00 committed by ameerj
parent c5ca4fe451
commit 690b1841e6
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_compute_program.cpp
View File

@ -125,10 +125,7 @@ void ComputeProgram::Configure() {
texture_cache.FillComputeImageViews(indices_span, image_view_ids); texture_cache.FillComputeImageViews(indices_span, image_view_ids);
if (assembly_program.handle != 0) { if (assembly_program.handle != 0) {
// FIXME: State track this program_manager.BindComputeAssemblyProgram(assembly_program.handle);
glEnable(GL_COMPUTE_PROGRAM_NV);
glBindProgramARB(GL_COMPUTE_PROGRAM_NV, assembly_program.handle);
program_manager.BindProgram(0);
} else { } else {
program_manager.BindProgram(source_program.handle); program_manager.BindProgram(source_program.handle);
} }

19
src/video_core/renderer_opengl/gl_shader_manager.h
View File

@ -10,6 +10,7 @@
#include <glad/glad.h> #include <glad/glad.h>
#include "video_core/renderer_opengl/gl_resource_manager.h" #include "video_core/renderer_opengl/gl_resource_manager.h"
#include "video_core/renderer_opengl/gl_device.h"
#pragma optimize("", off) #pragma optimize("", off)
@ -24,6 +25,12 @@ class ProgramManager {
}; };
public: public:
explicit ProgramManager(const Device& device) {
if (device.UseAssemblyShaders()) {
glEnable(GL_COMPUTE_PROGRAM_NV);
}
}
void BindProgram(GLuint program) { void BindProgram(GLuint program) {
if (current_source_program == program) { if (current_source_program == program) {
return; return;
@ -32,6 +39,17 @@ public:
glUseProgram(program); glUseProgram(program);
} }
void BindComputeAssemblyProgram(GLuint program) {
if (current_compute_assembly_program != program) {
current_compute_assembly_program = program;
glBindProgramARB(GL_COMPUTE_PROGRAM_NV, program);
}
if (current_source_program != 0) {
current_source_program = 0;
glUseProgram(0);
}
}
void BindAssemblyPrograms(std::span<const OGLAssemblyProgram, NUM_STAGES> programs, void BindAssemblyPrograms(std::span<const OGLAssemblyProgram, NUM_STAGES> programs,
u32 stage_mask) { u32 stage_mask) {
const u32 changed_mask = current_assembly_mask ^ stage_mask; const u32 changed_mask = current_assembly_mask ^ stage_mask;
@ -67,6 +85,7 @@ private:
u32 current_assembly_mask = 0; u32 current_assembly_mask = 0;
std::array<GLuint, NUM_STAGES> current_assembly_programs; std::array<GLuint, NUM_STAGES> current_assembly_programs;
GLuint current_compute_assembly_program = 0;
}; };
} // namespace OpenGL } // namespace OpenGL

1
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -130,6 +130,7 @@ RendererOpenGL::RendererOpenGL(Core::TelemetrySession& telemetry_session_,
std::unique_ptr<Core::Frontend::GraphicsContext> context_) std::unique_ptr<Core::Frontend::GraphicsContext> context_)
: RendererBase{emu_window_, std::move(context_)}, telemetry_session{telemetry_session_}, : RendererBase{emu_window_, std::move(context_)}, telemetry_session{telemetry_session_},
emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_}, state_tracker{gpu}, emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_}, state_tracker{gpu},
program_manager{device},
rasterizer(emu_window, gpu, cpu_memory, device, screen_info, program_manager, state_tracker) { rasterizer(emu_window, gpu, cpu_memory, device, screen_info, program_manager, state_tracker) {
if (Settings::values.renderer_debug && GLAD_GL_KHR_debug) { if (Settings::values.renderer_debug && GLAD_GL_KHR_debug) {
glEnable(GL_DEBUG_OUTPUT); glEnable(GL_DEBUG_OUTPUT);