[Igarden-commit] CommonSource/CQTImagePane CGWorld.cpp, 1.22.2.3, 1.22.2.4
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2008-05-31 13:40:42
|
Update of /cvsroot/igarden/CommonSource/CQTImagePane In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4382/CQTImagePane Modified Files: Tag: Release_branch_v1 CGWorld.cpp Log Message: Fix OpenGL textures (fill pattern) on MacIntel hardware. Index: CGWorld.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/CQTImagePane/CGWorld.cpp,v retrieving revision 1.22.2.3 retrieving revision 1.22.2.4 diff -C2 -d -r1.22.2.3 -r1.22.2.4 *** CGWorld.cpp 18 Apr 2008 21:59:32 -0000 1.22.2.3 --- CGWorld.cpp 31 May 2008 13:40:25 -0000 1.22.2.4 *************** *** 603,607 **** --- 603,611 ---- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + #if OPT_NATIVEORDER glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buf); + #else + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, buf); + #endif UnlockPixels(); } |