LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 8bbc54f445 0a931f5580
commit 1a9ad005bd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp
View File

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