| … | |
… | |
| 175 | glBindTexture (GL_TEXTURE_2D, name); |
175 | glBindTexture (GL_TEXTURE_2D, name); |
| 176 | |
176 | |
| 177 | if (!apple_nvidia_bug_workaround) |
177 | if (!apple_nvidia_bug_workaround) |
| 178 | { |
178 | { |
| 179 | glPixelStorei (GL_UNPACK_ROW_LENGTH, stride); |
179 | glPixelStorei (GL_UNPACK_ROW_LENGTH, stride); |
| 180 | glPixelStorei (GL_UNPACK_ALIGNMENT, 1); |
180 | /*glPixelStorei (GL_UNPACK_ALIGNMENT, 1); expected cfplus default */ |
| 181 | glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm); |
181 | glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm); |
|
|
182 | /*glPixelStorei (GL_UNPACK_ALIGNMENT, 4);*/ |
| 182 | glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); |
183 | glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); |
| 183 | glPixelStorei (GL_UNPACK_ALIGNMENT, 4); |
|
|
| 184 | } |
184 | } |
| 185 | else |
185 | else |
| 186 | { |
186 | { |
| 187 | /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */ |
187 | /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */ |
| 188 | /* when glTexSubImage is used, so do it the horribly slow way, */ |
188 | /* when glTexSubImage is used, so do it the horribly slow way, */ |
