archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

OpenGL rendered: use textures cache

Browse source
This commit is contained in:
DH 2016-06-23 01:01:29 +03:00
parent 001ab05f1a
commit 714e07b1dc
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ void GLGSRender::end()
//setup textures //setup textures
{ {
int texture_index = 0; //int texture_index = 0;
for (int i = 0; i < rsx::limits::textures_count; ++i) for (int i = 0; i < rsx::limits::textures_count; ++i)
{ {
int location; int location;
@ -322,10 +322,13 @@ void GLGSRender::end()
continue; continue;
} }
__glcheck glProgramUniform1i(m_program->id(), location, i); m_gl_textures[i].set_target(get_gl_target_for_texture(textures[i]));
__glcheck m_gl_textures[i].init(i, textures[i]); __glcheck m_gl_texture_cache.upload_texture(i, textures[i], m_gl_textures[i], m_rtts);
texture_index++; __glcheck glProgramUniform1i(m_program->id(), location, i);
//__glcheck m_gl_textures[i].init(i, textures[i]);
//texture_index++;
if (m_program->uniforms.has_location("texture" + std::to_string(i) + "_cm", &location)) if (m_program->uniforms.has_location("texture" + std::to_string(i) + "_cm", &location))
{ {

2
rsx_program_decompiler

@ -1 +1 @@
Subproject commit e1bd56e959e4eaae181c7c19b94fe2fb1ec00c08 Subproject commit 9f8814af57264c82b7e063c1df5d71dc32c7a951