summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2015-02-11 14:24:33 -0800
committerEric Anholt <[email protected]>2015-02-20 11:36:34 -0800
commit41b1882ed45f0fcb827a178cb3f7143fcaa8c4d9 (patch)
treeb9a2f335d36f6bc2adbf4963a4ab82cdefb6cfd9 /src/mesa/drivers
parent5ca019358f7a598174bd4adb6746fedc0ca78943 (diff)
mesa: Use u_math.h from macros.h
This avoids duplication of some macros and other definitions across the tree. Note that COPY_4FV switches from a memcpy-based implementation to an assignment of 4 floats. Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i915/intel_tris.c6
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_util.h6
-rw-r--r--src/mesa/drivers/dri/r200/r200_sanity.c2
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_sanity.c2
4 files changed, 0 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 94d85ce68c1..2c0a78562a0 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -1268,12 +1268,6 @@ intelFallback(struct intel_context *intel, GLbitfield bit, bool mode)
}
}
-union fi
-{
- GLfloat f;
- GLint i;
-};
-
/**********************************************************************/
/* Initialization. */
/**********************************************************************/
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_util.h b/src/mesa/drivers/dri/nouveau/nouveau_util.h
index e9721c3a7ab..8087445b65a 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_util.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_util.h
@@ -129,12 +129,6 @@ log2i(unsigned i)
return r;
}
-static inline unsigned
-align(unsigned x, unsigned m)
-{
- return (x + m - 1) & ~(m - 1);
-}
-
static inline void
get_scissors(struct gl_framebuffer *fb, int *x, int *y, int *w, int *h)
{
diff --git a/src/mesa/drivers/dri/r200/r200_sanity.c b/src/mesa/drivers/dri/r200/r200_sanity.c
index 34d83d89b38..8f7c0fe268f 100644
--- a/src/mesa/drivers/dri/r200/r200_sanity.c
+++ b/src/mesa/drivers/dri/r200/r200_sanity.c
@@ -593,8 +593,6 @@ static struct reg_names vector_names[] = {
{ 1000, "" },
};
-union fi { float f; int i; };
-
#define ISVEC 1
#define ISFLOAT 2
#define TOUCHED 4
diff --git a/src/mesa/drivers/dri/radeon/radeon_sanity.c b/src/mesa/drivers/dri/radeon/radeon_sanity.c
index 657a8c3674a..bb2a3bf7854 100644
--- a/src/mesa/drivers/dri/radeon/radeon_sanity.c
+++ b/src/mesa/drivers/dri/radeon/radeon_sanity.c
@@ -315,8 +315,6 @@ static struct reg_names vector_names[] = {
{ 1000, "" },
};
-union fi { float f; int i; };
-
#define ISVEC 1
#define ISFLOAT 2
#define TOUCHED 4