| … | |
… | |
| 159 | { |
159 | { |
| 160 | tc_put (&g->tex); |
160 | tc_put (&g->tex); |
| 161 | g_slice_free (glyph_info, g); |
161 | g_slice_free (glyph_info, g); |
| 162 | } |
162 | } |
| 163 | |
163 | |
|
|
164 | static int apple_nvidia_bug_workaround; |
|
|
165 | |
|
|
166 | static void |
|
|
167 | apple_nvidia_bug (int enable) |
|
|
168 | { |
|
|
169 | apple_nvidia_bug_workaround = enable; |
|
|
170 | } |
|
|
171 | |
|
|
172 | static void |
|
|
173 | tex_update (int name, int x, int y, int w, int stride, int h, void *bm) |
|
|
174 | { |
|
|
175 | glBindTexture (GL_TEXTURE_2D, name); |
|
|
176 | |
|
|
177 | if (!apple_nvidia_bug_workaround) |
|
|
178 | { |
|
|
179 | glPixelStorei (GL_UNPACK_ROW_LENGTH, stride); |
|
|
180 | glPixelStorei (GL_UNPACK_ALIGNMENT, 1); |
|
|
181 | glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm); |
|
|
182 | glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); |
|
|
183 | glPixelStorei (GL_UNPACK_ALIGNMENT, 4); |
|
|
184 | } |
|
|
185 | else |
|
|
186 | { |
|
|
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, */ |
|
|
189 | /* reading/patching/uploading the full texture one each change */ |
|
|
190 | int r; |
|
|
191 | |
|
|
192 | glGetTexImage (GL_TEXTURE_2D, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile); |
|
|
193 | |
|
|
194 | for (r = 0; r < h; ++r) |
|
|
195 | memcpy (tc_temptile + (y + r) * TC_WIDTH + x, (char *)bm + r * stride, w); |
|
|
196 | |
|
|
197 | glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, TC_WIDTH, TC_HEIGHT, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile); |
|
|
198 | } |
|
|
199 | } |
|
|
200 | |
| 164 | static void |
201 | static void |
| 165 | draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) |
202 | draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) |
| 166 | { |
203 | { |
| 167 | PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); |
204 | PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); |
| 168 | glyph_info *g; |
205 | glyph_info *g; |
| … | |
… | |
| 196 | g->top = bm.top; |
233 | g->top = bm.top; |
| 197 | |
234 | |
| 198 | tc_get (&g->tex, bm.width, bm.height); |
235 | tc_get (&g->tex, bm.width, bm.height); |
| 199 | |
236 | |
| 200 | if (bm.width && bm.height) |
237 | if (bm.width && bm.height) |
| 201 | { |
238 | tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap); |
| 202 | glBindTexture (GL_TEXTURE_2D, g->tex.name); |
|
|
| 203 | glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); |
|
|
| 204 | glPixelStorei (GL_UNPACK_ALIGNMENT, 1); |
|
|
| 205 | glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); |
|
|
| 206 | glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); |
|
|
| 207 | glPixelStorei (GL_UNPACK_ALIGNMENT, 4); |
|
|
| 208 | } |
|
|
| 209 | } |
239 | } |
| 210 | |
240 | |
| 211 | x += g->left; |
241 | x += g->left; |
| 212 | y -= g->top; |
242 | y -= g->top; |
| 213 | |
243 | |
