summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/compiz-core.h41
-rw-r--r--include/compwindow.h4
-rw-r--r--src/paint.cpp8
-rw-r--r--src/privatewindow.h2
-rw-r--r--src/texture.cpp2
-rw-r--r--src/window.cpp8
6 files changed, 25 insertions, 40 deletions
diff --git a/include/compiz-core.h b/include/compiz-core.h
index 1ef11c1..2d65ada 100644
--- a/include/compiz-core.h
+++ b/include/compiz-core.h
@@ -739,11 +739,11 @@ typedef struct _WindowPaintAttrib {
extern ScreenPaintAttrib defaultScreenPaintAttrib;
extern WindowPaintAttrib defaultWindowPaintAttrib;
-typedef struct _CompMatrix {
+typedef struct _CompTextureMatrix {
float xx; float yx;
float xy; float yy;
float x0; float y0;
-} CompMatrix;
+} CompTextureMatrix;
#define COMP_TEX_COORD_X(m, vx) ((m)->xx * (vx) + (m)->x0)
#define COMP_TEX_COORD_Y(m, vy) ((m)->yy * (vy) + (m)->y0)
@@ -838,21 +838,6 @@ prepareXCoords (CompScreen *screen,
float z);
-Bool
-moreWindowVertices (CompWindow *w,
- int newSize);
-
-Bool
-moreWindowIndices (CompWindow *w,
- int newSize);
-
-void
-addWindowGeometry (CompWindow *w,
- CompMatrix *matrix,
- int nMatrix,
- Region region,
- Region clip);
-
/* texture.c */
#define POWER_OF_TWO(v) ((v & (v - 1)) == 0)
@@ -865,16 +850,16 @@ typedef enum {
typedef int CompTextureFilter;
struct _CompTexture {
- GLuint name;
- GLenum target;
- GLfloat dx, dy;
- GLXPixmap pixmap;
- GLenum filter;
- GLenum wrap;
- CompMatrix matrix;
- Bool oldMipmaps;
- Bool mipmap;
- int refCount;
+ GLuint name;
+ GLenum target;
+ GLfloat dx, dy;
+ GLXPixmap pixmap;
+ GLenum filter;
+ GLenum wrap;
+ CompTextureMatrix matrix;
+ Bool oldMipmaps;
+ Bool mipmap;
+ int refCount;
};
void
@@ -1193,7 +1178,7 @@ struct _CompCursor {
int x;
int y;
- CompMatrix matrix;
+ CompTextureMatrix matrix;
};
#define ACTIVE_WINDOW_HISTORY_SIZE 64
diff --git a/include/compwindow.h b/include/compwindow.h
index 139f64e..94e39eb 100644
--- a/include/compwindow.h
+++ b/include/compwindow.h
@@ -18,7 +18,7 @@ class WindowInterface : public WrapableInterface<CompWindow> {
const CompTransform *, Region, unsigned int);
WRAPABLE_DEF(bool, draw, const CompTransform *,
const FragmentAttrib *, Region, unsigned int);
- WRAPABLE_DEF(void, addGeometry, CompMatrix *matrix,
+ WRAPABLE_DEF(void, addGeometry, CompTextureMatrix *matrix,
int, Region, Region);
WRAPABLE_DEF(void, drawTexture, CompTexture *texture,
const FragmentAttrib *, unsigned int);
@@ -461,7 +461,7 @@ class CompWindow : public WrapableHandler<WindowInterface>, public CompObject {
const CompTransform *, Region, unsigned int);
WRAPABLE_HND(bool, draw, const CompTransform *,
const FragmentAttrib *, Region, unsigned int);
- WRAPABLE_HND(void, addGeometry, CompMatrix *matrix,
+ WRAPABLE_HND(void, addGeometry, CompTextureMatrix *matrix,
int, Region, Region);
WRAPABLE_HND(void, drawTexture, CompTexture *texture,
const FragmentAttrib *, unsigned int);
diff --git a/src/paint.cpp b/src/paint.cpp
index f61f016..b65e03f 100644
--- a/src/paint.cpp
+++ b/src/paint.cpp
@@ -720,10 +720,10 @@ CompWindow::drawGeometry ()
}
void
-CompWindow::addGeometry (CompMatrix *matrix,
- int nMatrix,
- Region region,
- Region clip)
+CompWindow::addGeometry (CompTextureMatrix *matrix,
+ int nMatrix,
+ Region region,
+ Region clip)
{
WRAPABLE_HND_FUNC(addGeometry, matrix, nMatrix, region, clip)
diff --git a/src/privatewindow.h b/src/privatewindow.h
index 0358feb..6e20a32 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -153,7 +153,7 @@ class PrivateWindow {
XSizeHints sizeHints;
Pixmap pixmap;
CompTexture *texture;
- CompMatrix matrix;
+ CompTextureMatrix matrix;
Damage damage;
bool inputHint;
bool alpha;
diff --git a/src/texture.cpp b/src/texture.cpp
index 304cb36..265fe5f 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -34,7 +34,7 @@
#include <compiz-core.h>
#include "privatescreen.h"
-static CompMatrix _identity_matrix = {
+static CompTextureMatrix _identity_matrix = {
1.0f, 0.0f,
0.0f, 1.0f,
0.0f, 0.0f
diff --git a/src/window.cpp b/src/window.cpp
index 75b81fc..7c8c5c9 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4218,10 +4218,10 @@ WindowInterface::draw (const CompTransform *transform,
WRAPABLE_DEF_FUNC_RETURN(draw, transform, fragment, region, mask)
void
-WindowInterface::addGeometry (CompMatrix *matrix,
- int nMatrix,
- Region region,
- Region clip)
+WindowInterface::addGeometry (CompTextureMatrix *matrix,
+ int nMatrix,
+ Region region,
+ Region clip)
WRAPABLE_DEF_FUNC(addGeometry, matrix, nMatrix, region, clip)
void