mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-31 07:40:11 +01:00
Consolidate some redundant definitions of ARRAY_SIZE() macro.
Previous to this patch, there were 13 identical definitions of this macro in Mesa source. That's ridiculous. This patch consolidates 6 of them to a single definition in src/mesa/main/macros.h. Unfortunately, I wasn't able to eliminate the remaining definitions, since they occur in places that don't include src/mesa/main/macros.h: - include/pci_ids/pci_id_driver_map.h - src/egl/drivers/dri2/egl_dri2.h - src/egl/main/egldefines.h - src/gbm/main/backend.c - src/gbm/main/gbm.c - src/glx/glxclient.h - src/mapi/mapi/stub.c I'm open to suggestions as to how to deal with the remaining redundancy. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
dc92b2d11f
commit
a4b9678a54
7 changed files with 7 additions and 10 deletions
|
|
@ -32,6 +32,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include "main/macros.h"
|
||||
#include "main/mtypes.h"
|
||||
#include "main/cpuinfo.h"
|
||||
#include "main/extensions.h"
|
||||
|
|
@ -391,8 +392,6 @@ static const struct { unsigned int attrib, offset; } attribMap[] = {
|
|||
__ATTRIB(__DRI_ATTRIB_SWAP_METHOD, level)
|
||||
};
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
|
||||
|
||||
|
||||
/**
|
||||
* Return the value of a configuration attribute. The attribute is
|
||||
|
|
|
|||
|
|
@ -348,8 +348,6 @@ extern char *__progname;
|
|||
#define SUBPIXEL_X 0.125
|
||||
#define SUBPIXEL_Y 0.125
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
|
||||
|
||||
/**
|
||||
* Align a value down to an alignment value
|
||||
*
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include <stdbool.h>
|
||||
#include <assert.h>
|
||||
#include "main/formats.h"
|
||||
#include "main/macros.h"
|
||||
#include "intel_context.h"
|
||||
#include "intel_screen.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -701,8 +701,6 @@ radeonDestroyBuffer(__DRIdrawable *driDrawPriv)
|
|||
_mesa_reference_framebuffer((struct gl_framebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
|
||||
}
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
|
||||
|
||||
/**
|
||||
* This is the driver specific part of the createNewScreen entry point.
|
||||
* Called when using DRI2.
|
||||
|
|
|
|||
|
|
@ -44,10 +44,9 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "main/hash_table.h"
|
||||
#include "main/macros.h"
|
||||
#include "ralloc.h"
|
||||
|
||||
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
|
||||
|
||||
static const uint32_t deleted_key_value;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -766,5 +766,8 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y)
|
|||
#define ENUM_TO_DOUBLE(E) ((GLdouble)(GLint)(E))
|
||||
#define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE)
|
||||
|
||||
/* Compute the size of an array */
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,11 +34,10 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "macros.h"
|
||||
#include "set.h"
|
||||
#include "ralloc.h"
|
||||
|
||||
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
|
||||
|
||||
/*
|
||||
* From Knuth -- a good choice for hash/rehash values is p, p-2 where
|
||||
* p and p-2 are both prime. These tables are sized to have an extra 10%
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue