archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 19:28:43 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

OpenGL renderer improvements

Browse source 
Flush program cache at thread exit
Use cached locations
This commit is contained in:
DH 2015-10-14 03:15:23 +03:00
parent 3f6b826ab0
commit 4a55ba3067
3 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/RSX/Common/ProgramStateCache.h
View file

@ -290,11 +290,20 @@ private:
public: public:
ProgramStateCache() : m_currentShaderId(0) {} ProgramStateCache() : m_currentShaderId(0) {}
~ProgramStateCache() ~ProgramStateCache()
{
clear();
}
void clear()
{ {
for (auto pair : m_cachePSO) for (auto pair : m_cachePSO)
BackendTraits::DeleteProgram(pair.second); BackendTraits::DeleteProgram(pair.second);
m_cachePSO.clear();
for (auto pair : m_cacheFS) for (auto pair : m_cacheFS)
free(pair.first); free(pair.first);
m_cacheFS.clear();
} }
typename BackendTraits::PipelineData *getGraphicPipelineState( typename BackendTraits::PipelineData *getGraphicPipelineState(

39
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View file

@ -840,10 +840,10 @@ void GLGSRender::end()
return; return;
} }
LOG_NOTICE(Log::RSX, "draw()"); //LOG_NOTICE(Log::RSX, "draw()");
draw_fbo.bind(); draw_fbo.bind();
m_program.use(); m_program->use();
//setup textures //setup textures
for (int i = 0; i < rsx::limits::textures_count; ++i) for (int i = 0; i < rsx::limits::textures_count; ++i)
@ -852,10 +852,10 @@ void GLGSRender::end()
continue; continue;
int location; int location;
if (m_program.uniforms.has_location("tex" + std::to_string(i), &location)) if (m_program->uniforms.has_location("tex" + std::to_string(i), &location))
{ {
__glcheck m_gl_textures[i].init(textures[i]); __glcheck m_gl_textures[i].init(textures[i]);
__glcheck m_program.uniforms.texture(location, i, gl::texture_view(gl::texture::target::texture2D, m_gl_textures[i].id())); __glcheck m_program->uniforms.texture(location, i, gl::texture_view(gl::texture::target::texture2D, m_gl_textures[i].id()));
} }
} }
@ -997,11 +997,11 @@ void GLGSRender::end()
"in_tc4", "in_tc5", "in_tc6", "in_tc7" "in_tc4", "in_tc5", "in_tc6", "in_tc7"
}; };
int location = m_program.attribs.location(reg_table[index]); int location = m_program->attribs.location(reg_table[index]);
if (vertex_info.array) if (vertex_info.array)
{ {
__glcheck m_program.attribs[location] = __glcheck m_program->attribs[location] =
(m_vao + vertex_arrays_offsets[index]) (m_vao + vertex_arrays_offsets[index])
.config(gl_types[vertex_info.type], vertex_info.size, gl_normalized[vertex_info.type]); .config(gl_types[vertex_info.type], vertex_info.size, gl_normalized[vertex_info.type]);
} }
@ -1014,10 +1014,10 @@ void GLGSRender::end()
case CELL_GCM_VERTEX_F: case CELL_GCM_VERTEX_F:
switch (vertex_info.size) switch (vertex_info.size)
{ {
case 1: apply_attrib_array<f32, 1>(m_program, location, vertex_data); break; case 1: apply_attrib_array<f32, 1>(*m_program, location, vertex_data); break;
case 2: apply_attrib_array<f32, 2>(m_program, location, vertex_data); break; case 2: apply_attrib_array<f32, 2>(*m_program, location, vertex_data); break;
case 3: apply_attrib_array<f32, 3>(m_program, location, vertex_data); break; case 3: apply_attrib_array<f32, 3>(*m_program, location, vertex_data); break;
case 4: apply_attrib_array<f32, 4>(m_program, location, vertex_data); break; case 4: apply_attrib_array<f32, 4>(*m_program, location, vertex_data); break;
} }
break; break;
@ -1095,11 +1095,13 @@ void GLGSRender::onexit_thread()
if (m_vao) if (m_vao)
m_vao.remove(); m_vao.remove();
m_prog_buffer.clear();
} }
void nv4097_clear_surface(u32 arg, GLGSRender* renderer) void nv4097_clear_surface(u32 arg, GLGSRender* renderer)
{ {
LOG_NOTICE(Log::RSX, "nv4097_clear_surface(0x%x)", arg); //LOG_NOTICE(Log::RSX, "nv4097_clear_surface(0x%x)", arg);
if ((arg & 0xf3) == 0) if ((arg & 0xf3) == 0)
{ {
@ -1214,11 +1216,8 @@ bool GLGSRender::load_program()
fragment_program.addr = rsx::get_address(fragment_program.offset, (shader_program & 0x3) - 1); fragment_program.addr = rsx::get_address(fragment_program.offset, (shader_program & 0x3) - 1);
fragment_program.ctrl = rsx::method_registers[NV4097_SET_SHADER_CONTROL]; fragment_program.ctrl = rsx::method_registers[NV4097_SET_SHADER_CONTROL];
gl::glsl::program *result; __glcheck m_program = m_prog_buffer.getGraphicPipelineState(&vertex_program, &fragment_program, nullptr, nullptr);
__glcheck result = m_prog_buffer.getGraphicPipelineState(&vertex_program, &fragment_program, nullptr, nullptr); __glcheck m_program->use();
__glcheck result->use();
m_program.set_id(result->id());
#else #else
std::vector<u32> vertex_program; std::vector<u32> vertex_program;
@ -1287,12 +1286,12 @@ bool GLGSRender::load_program()
scaleOffsetMat[1][3] = viewport_offset_y * 2.f / viewport_h - 1.f; scaleOffsetMat[1][3] = viewport_offset_y * 2.f / viewport_h - 1.f;
scaleOffsetMat[2][3] = viewport_offset_z - .5f; scaleOffsetMat[2][3] = viewport_offset_z - .5f;
__glcheck m_program.uniforms["scaleOffsetMat"] = scaleOffsetMat; __glcheck m_program->uniforms["scaleOffsetMat"] = scaleOffsetMat;
for (auto &constant : transform_constants) for (auto &constant : transform_constants)
{ {
//LOG_WARNING(RSX, "vc[%u] = (%f, %f, %f, %f)", constant.first, constant.second.r, constant.second.g, constant.second.b, constant.second.a); //LOG_WARNING(RSX, "vc[%u] = (%f, %f, %f, %f)", constant.first, constant.second.r, constant.second.g, constant.second.b, constant.second.a);
__glcheck m_program.uniforms["vc[" + std::to_string(constant.first) + "]"] = constant.second; __glcheck m_program->uniforms["vc[" + std::to_string(constant.first) + "]"] = constant.second;
} }
for (u32 constant_offset : m_prog_buffer.getFragmentConstantOffsetsCache(&fragment_program)) for (u32 constant_offset : m_prog_buffer.getFragmentConstantOffsetsCache(&fragment_program))
@ -1304,7 +1303,7 @@ bool GLGSRender::load_program()
u32 c2 = (data[2] >> 16 | data[2] << 16); u32 c2 = (data[2] >> 16 | data[2] << 16);
u32 c3 = (data[3] >> 16 | data[3] << 16); u32 c3 = (data[3] >> 16 | data[3] << 16);
m_program.uniforms["fc" + std::to_string(constant_offset)] = color4f{ (f32&)c0, (f32&)c1, (f32&)c2, (f32&)c3 }; m_program->uniforms["fc" + std::to_string(constant_offset)] = color4f{ (f32&)c0, (f32&)c1, (f32&)c2, (f32&)c3 };
} }
return true; return true;
@ -1714,7 +1713,7 @@ void GLGSRender::write_buffers()
void GLGSRender::flip(int buffer) void GLGSRender::flip(int buffer)
{ {
LOG_NOTICE(Log::RSX, "flip(%d)", buffer); //LOG_NOTICE(Log::RSX, "flip(%d)", buffer);
u32 buffer_width = gcm_buffers[buffer].width; u32 buffer_width = gcm_buffers[buffer].width;
u32 buffer_height = gcm_buffers[buffer].height; u32 buffer_height = gcm_buffers[buffer].height;
u32 buffer_pitch = gcm_buffers[buffer].pitch; u32 buffer_pitch = gcm_buffers[buffer].pitch;

3
rpcs3/Emu/RSX/GL/GLGSRender.h
View file

@ -57,8 +57,7 @@ private:
GLTexture m_gl_textures[rsx::limits::textures_count]; GLTexture m_gl_textures[rsx::limits::textures_count];
GLTexture m_gl_vertex_textures[rsx::limits::vertex_textures_count]; GLTexture m_gl_vertex_textures[rsx::limits::vertex_textures_count];
//TODO: program cache gl::glsl::program *m_program;
gl::glsl::program m_program;
rsx::surface_info m_surface; rsx::surface_info m_surface;