← Back to branch summary

~3v1n0/unity/overlay-border-scale

« back to all changes in this revision

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

  • Committer: Daniel van Vugt
  • Date: 2012-03-14 06:24:18 UTC
  • mfrom: (2108 unity)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: daniel.van.vugt@canonical.com-20120314062418-nprucpbr0m7qky5e
Merged latest lp:unity

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unitydialog/src/unitydialog.h
64
64
                        int                         max);
65
65
      void setTexture (GLTexture *);
66
66
 
 
67
#ifdef USE_GLES
 
68
      void addGeometriesAndDrawTextureForWindow (CompWindow     *w,
 
69
                                                 const GLMatrix &transform,
 
70
                                                 unsigned int    mask);
 
71
#else
67
72
      void addGeometriesAndDrawTextureForWindow (CompWindow *, unsigned int pm);
 
73
#endif
68
74
 
69
75
    private:
70
76
      GLTexture*         mTexture;
78
84
      PaintInfoCollector (CompWindow *w);
79
85
 
80
86
      void collect ();
 
87
#ifdef USE_GLES
 
88
      void drawGeometriesForWindow (CompWindow     *w,
 
89
                                    const GLMatrix &transform,
 
90
                                    unsigned int    pm);
 
91
#else
81
92
      void drawGeometriesForWindow (CompWindow *w, unsigned int pm);
 
93
#endif
82
94
 
83
95
      void processGeometry (const GLTexture::MatrixList &ml,
84
96
                            const CompRegion            &r,
242
254
public:
243
255
 
244
256
  bool
245
 
  glDraw(const GLMatrix&, GLFragment::Attrib&,
 
257
  glDraw(const GLMatrix&,
 
258
#ifdef USE_GLES
 
259
         const GLWindowPaintAttrib&,
 
260
#else
 
261
         GLFragment::Attrib&,
 
262
#endif
246
263
         const CompRegion&, unsigned int);
247
264
 
248
265
  bool
258
275
 
259
276
  void
260
277
  glDrawTexture(GLTexture* texture,
 
278
#ifdef USE_GLES
 
279
                const GLMatrix& transform,
 
280
                const GLWindowPaintAttrib& attrib,
 
281
#else
261
282
                GLFragment::Attrib& attrib,
 
283
#endif
262
284
                unsigned int mask);
263
285
 
264
286