ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1310 from vlj/gl 

gl: Use uniform buffer for transform constants.
This commit is contained in:
Ivan 2015-11-20 00:16:39 +03:00
parent 247af0ebbf 5447521ce5
commit 68608ef894
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -1064,8 +1064,10 @@ void GLGSRender::oninit_thread()
m_vbo.create();
m_ebo.create();
m_scale_offset_buffer.create(16 * sizeof(float));
m_vertex_constants_buffer.create(512 * 4 * sizeof(float));
glBindBufferBase(GL_UNIFORM_BUFFER, 0, m_scale_offset_buffer.id());
glBindBufferBase(GL_UNIFORM_BUFFER, 1, m_vertex_constants_buffer.id());
m_vao.array_buffer = m_vbo;
m_vao.element_array_buffer = m_ebo;
@ -1268,12 +1270,10 @@ bool GLGSRender::load_program()
fill_scale_offset_data(buffer, false);
glUnmapBuffer(GL_UNIFORM_BUFFER);
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);
__glcheck m_program->uniforms["vc[" + std::to_string(constant.first) + "]"] = constant.second;
}
glBindBuffer(GL_UNIFORM_BUFFER, m_vertex_constants_buffer.id());
buffer = glMapBuffer(GL_UNIFORM_BUFFER, GL_WRITE_ONLY);
fill_vertex_program_constants_data(buffer);
glUnmapBuffer(GL_UNIFORM_BUFFER);
for (u32 constant_offset : m_prog_buffer.getFragmentConstantOffsetsCache(&fragment_program))
{

1
rpcs3/Emu/RSX/GL/GLGSRender.h
View File

@ -76,6 +76,7 @@ private:
gl::texture m_flip_tex_color;
gl::buffer m_scale_offset_buffer;
gl::buffer m_vertex_constants_buffer;
gl::buffer m_vbo;
gl::buffer m_ebo;

9
rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
View File

@ -46,11 +46,10 @@ void GLVertexDecompilerThread::insertInputs(std::stringstream & OS, const std::v
void GLVertexDecompilerThread::insertConstants(std::stringstream & OS, const std::vector<ParamType> & constants)
{
for (const ParamType PT : constants)
{
for (const ParamItem &PI : PT.items)
OS << "uniform " << PT.type << " " << PI.name << ";" << std::endl;
}
OS << "layout(std140, binding = 1) uniform VertexConstantsBuffer" << std::endl;
OS << "{" << std::endl;
OS << " vec4 vc[468];" << std::endl;
OS << "};" << std::endl;
}
struct reg_info