← Back to branch summary

~ubuntu-branches/ubuntu/quantal/compiz/quantal

« back to all changes in this revision

Viewing changes to plugins/cube/include/cube/cube.h

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sam Spilsbury, Timo Jyrinki
  • Date: 2012-08-31 22:59:50 UTC
  • mfrom: (3248.2.13) (3275.1.12 ubuntu)
  • Revision ID: package-import@ubuntu.com-20120831225950-cnw9yf4f5t70gtwj
Tags: 1:0.9.8.0-0ubuntu1
https://launchpad.net/bugs/201342
https://launchpad.net/bugs/901097
https://launchpad.net/bugs/1004251
https://launchpad.net/bugs/1037710
* debian/control, debian/rules: 
  - enable gles on armel and armhf
  - use dh-translations rather than custom code

[ Sam Spilsbury ]
* Enable OpenGL ES building 
  - Refresh debian/patches/workaround_broken_drivers.patch
  - Remove non-ported plugins from compiz-plugins
  - Add FindOpenGLES2.cmake to compiz-dev

[ Timo Jyrinki ]
* New upstream release.
  - Code to make compiz work on GLES. This includes several changes 
    to the compiz API. (LP: #201342) (LP: #901097) (LP: #1004251)
    (LP: #1037710)
  - Draft first 0.9.8.0 NEWS and bump VERSION
* debian/patches/compiz-package-gles2.patch:
  - Remove, obsoleted by the upstream GLES work 
* Disable plugins that don't work on pure GLES on armhf/armel:
  - bench, firepaint, mblur, showmouse, splash, showrepaint, td, widget

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cube/include/cube/cube.h
62
62
        virtual void cubePaintTop (const GLScreenPaintAttrib &sAttrib,
63
63
                                   const GLMatrix            &transform,
64
64
                                   CompOutput                *output,
65
 
                                   int                       size);
 
65
                                   int                       size,
 
66
                                   const GLVector            &normal);
66
67
        virtual void cubePaintBottom (const GLScreenPaintAttrib &sAttrib,
67
68
                                      const GLMatrix            &transform,
68
69
                                      CompOutput                *output,
69
 
                                      int                       size);
 
70
                                      int                       size,
 
71
                                      const GLVector            &normal);
70
72
        virtual void cubePaintInside (const GLScreenPaintAttrib &sAttrib,
71
73
                                      const GLMatrix            &transform,
72
74
                                      CompOutput                *output,
73
 
                                      int                       size);
 
75
                                      int                       size,
 
76
                                      const GLVector            &normal);
74
77
        virtual bool cubeCheckOrientation (const GLScreenPaintAttrib &sAttrib,
75
78
                                           const GLMatrix            &transform,
76
79
                                           CompOutput                *output,
120
123
                      float, float);
121
124
        WRAPABLE_HND (2, CubeScreenInterface, void, cubePaintTop,
122
125
                      const GLScreenPaintAttrib &, const GLMatrix &,
123
 
                      CompOutput *, int);
 
126
                      CompOutput *, int, const GLVector &);
124
127
        WRAPABLE_HND (3, CubeScreenInterface, void, cubePaintBottom,
125
128
                      const GLScreenPaintAttrib &, const GLMatrix &,
126
 
                      CompOutput *, int);
 
129
                      CompOutput *, int, const GLVector &);
127
130
        WRAPABLE_HND (4, CubeScreenInterface, void, cubePaintInside,
128
131
                      const GLScreenPaintAttrib &, const GLMatrix &,
129
 
                      CompOutput *, int);
 
132
                      CompOutput *, int, const GLVector &);
130
133
        WRAPABLE_HND (5, CubeScreenInterface, bool, cubeCheckOrientation,
131
134
                      const GLScreenPaintAttrib &, const GLMatrix &,
132
135
                      CompOutput *, std::vector<GLVector> &);