← Back to branch summary

~muktupavels/compiz/gnome

« back to all changes in this revision

Viewing changes to plugins/imgsvg/src/imgsvg.cpp

Import GLES2 branch: lp:~compiz-linaro-team/compiz-core/compiz-core.gles2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/imgsvg/src/imgsvg.cpp
220
220
}
221
221
 
222
222
bool
223
 
SvgWindow::glDraw (const GLMatrix     &transform,
224
 
                   GLFragment::Attrib &fragment,
225
 
                   const CompRegion   &region,
226
 
                   unsigned int       mask)
 
223
SvgWindow::glDraw (const GLMatrix            &transform,
 
224
                   const GLWindowPaintAttrib &attrib,
 
225
                   const CompRegion          &region,
 
226
                   unsigned int              mask)
227
227
{
228
 
    bool status = gWindow->glDraw (transform, fragment, region, mask);
 
228
    bool status = gWindow->glDraw (transform, attrib, region, mask);
229
229
 
230
230
    if (!status)
231
231
        return status;
251
251
        {
252
252
            matrix[0] = context->texture[0].matrices[i];
253
253
 
254
 
            gWindow->geometry ().reset ();
 
254
            gWindow->vertexBuffer ()->begin ();
255
255
            gWindow->glAddGeometry (matrix, context->box, reg);
 
256
            gWindow->vertexBuffer ()->end ();
256
257
 
257
258
            if (mask & PAINT_WINDOW_TRANSLUCENT_MASK)
258
259
                mask |= PAINT_WINDOW_BLEND_MASK;
259
260
 
260
 
            gWindow->glDrawTexture (context->texture[0].textures[i], fragment, mask);
 
261
            gWindow->glDrawTexture (context->texture[0].textures[i], transform,
 
262
                                    attrib, mask);
261
263
 
262
264
            if (rect.width () > 0 && rect.height () > 0)
263
265
            {
321
323
                    saveFilter = gScreen->filter (SCREEN_TRANS_FILTER);
322
324
                    gScreen->setFilter (SCREEN_TRANS_FILTER, GLTexture::Good);
323
325
 
324
 
                    gWindow->geometry ().reset ();
 
326
                    gWindow->vertexBuffer ()->begin ();
325
327
                    gWindow->glAddGeometry (matrix, r, reg);
 
328
                    gWindow->vertexBuffer ()->end ();
326
329
 
327
330
                    gWindow->glDrawTexture (context->texture[1].textures[j],
328
 
                                            fragment, mask);
 
331
                                            transform, attrib, mask);
329
332
 
330
333
                    gScreen->setFilter (SCREEN_TRANS_FILTER, saveFilter);
331
334
                }