am 1a9ad005: am 0a931f55: Merge "opengles emulator: fix uniform name translation to apps"

* commit '1a9ad005bd7e492a2aa48e8be1a281b1c621374c':
  opengles emulator: fix uniform name translation to apps
This commit is contained in:
David Turner
2011-08-10 02:23:34 -07:00
committed by Android Git Automerger

View File

@@ -82,13 +82,13 @@ void ProgramData::setupLocationShiftWAR()
GLint ProgramData::locationWARHostToApp(GLint hostLoc)
{
if (m_locShiftWAR) return hostLoc>>16;
if (m_locShiftWAR && hostLoc>0) return hostLoc>>16;
else return hostLoc;
}
GLint ProgramData::locationWARAppToHost(GLint appLoc)
{
if (m_locShiftWAR) return appLoc<<16;
if (m_locShiftWAR && appLoc>0) return appLoc<<16;
else return appLoc;
}