piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2357 from degasus/ogl_efb_poke_merge

Browse Source 
ogl: efb poke merge
This commit is contained in:
Ryan Houdek
2015-05-25 23:26:39 -04:00
parent 3817dd0f91 d91d935057
commit dad5d8e13d
8 changed files with 161 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -1108,23 +1108,13 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
case POKE_COLOR:
{
ResetAPIState();
glClearColor(float((poke_data >> 16) & 0xFF) / 255.0f,
float((poke_data >> 8) & 0xFF) / 255.0f,
float((poke_data >> 0) & 0xFF) / 255.0f,
float((poke_data >> 24) & 0xFF) / 255.0f);
glEnable(GL_SCISSOR_TEST);
glScissor(targetPixelRc.left, targetPixelRc.bottom, targetPixelRc.GetWidth(), targetPixelRc.GetHeight());
glClear(GL_COLOR_BUFFER_BIT);
RestoreAPIState();
// TODO: Could just update the EFB cache with the new value
ClearEFBCache();
std::vector<EfbPokeData> vector;
EfbPokeData d;
d.x = x;
d.y = y;
d.data = poke_data;
vector.push_back(d);
PokeEFB(type, vector);
break;
}
@ -1155,6 +1145,22 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
return 0;
}
void Renderer::PokeEFB(EFBAccessType type, const std::vector<EfbPokeData>& data)
{
switch(type)
{
case POKE_COLOR:
{
FramebufferManager::PokeEFB(type, data);
break;
}
default:
::Renderer::PokeEFB(type, data);
break;
}
}
u16 Renderer::BBoxRead(int index)
{
int swapped_index = index;