← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to plugins/unitydialog/src/unitydialog.h

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unitydialog/src/unitydialog.h
40
40
      GeometryCollection ();
41
41
      bool status ();
42
42
 
43
 
      void addGeometryForWindow (CompWindow *, const CompRegion &paintRegion);
 
43
      bool addGeometryForWindow (CompWindow *, const CompRegion &paintRegion);
44
44
      void addGeometry (const GLTexture::MatrixList &ml,
45
45
                        const CompRegion            &r,
46
46
                        int                         min,
64
64
                        int                         max);
65
65
      void setTexture (GLTexture *);
66
66
 
67
 
#ifdef USE_MODERN_COMPIZ_GL
68
67
      void addGeometriesAndDrawTextureForWindow (CompWindow     *w,
69
68
                                                 const GLMatrix &transform,
70
 
                                                 unsigned int    mask);
71
 
#else
72
 
      void addGeometriesAndDrawTextureForWindow (CompWindow *, unsigned int pm);
73
 
#endif
 
69
                                                 unsigned int    mask);
74
70
 
75
71
    private:
76
72
      GLTexture*         mTexture;
84
80
      PaintInfoCollector (CompWindow *w);
85
81
 
86
82
      void collect ();
87
 
#ifdef USE_MODERN_COMPIZ_GL
88
83
      void drawGeometriesForWindow (CompWindow     *w,
89
84
                                    const GLMatrix &transform,
90
85
                                    unsigned int    pm);
91
 
#else
92
 
      void drawGeometriesForWindow (CompWindow *w, unsigned int pm);
93
 
#endif
94
86
 
95
87
      void processGeometry (const GLTexture::MatrixList &ml,
96
88
                            const CompRegion            &r,
255
247
 
256
248
  bool
257
249
  glDraw(const GLMatrix&,
258
 
#ifdef USE_MODERN_COMPIZ_GL
259
250
         const GLWindowPaintAttrib&,
260
 
#else
261
 
         GLFragment::Attrib&,
262
 
#endif
263
251
         const CompRegion&, unsigned int);
264
252
 
265
253
  bool
275
263
 
276
264
  void
277
265
  glDrawTexture(GLTexture* texture,
278
 
#ifdef USE_MODERN_COMPIZ_GL
279
266
                const GLMatrix& transform,
280
267
                const GLWindowPaintAttrib& attrib,
281
 
#else
282
 
                GLFragment::Attrib& attrib,
283
 
#endif
284
268
                unsigned int mask);
285
269
 
286
270