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

* commit '0a931f5580cffab446d5eef5d87308eb67234ae9':
  opengles emulator: fix uniform name translation to apps
This commit is contained in:
David Turner
2011-08-10 02:21:50 -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;
}