projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Reduce repeated calculation of the attribute-offset-in-VUE.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mga
/
mgatris.c
diff --git
a/src/mesa/drivers/dri/mga/mgatris.c
b/src/mesa/drivers/dri/mga/mgatris.c
index 9f270d7d6c9185dd5c82cb864bf44ca3a1d09b20..07cf682f6e42ffaac37078e4eaa11e8b90d5ad1d 100644
(file)
--- a/
src/mesa/drivers/dri/mga/mgatris.c
+++ b/
src/mesa/drivers/dri/mga/mgatris.c
@@
-24,22
+24,20
@@
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/
* Authors:
* Keith Whitwell <keith@tungstengraphics.com>
*/
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatris.c,v 1.10 2002/10/30 12:51:36 alanh Exp $ */
-#include "mtypes.h"
-#include "macros.h"
-#include "colormac.h"
+#include "main/mtypes.h"
+#include "main/macros.h"
+#include "main/colormac.h"
+#include "main/mm.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
-#include "mm.h"
#include "mgacontext.h"
#include "mgaioctl.h"
#include "mgatris.h"
#include "mgavb.h"
#include "mgacontext.h"
#include "mgaioctl.h"
#include "mgatris.h"
#include "mgavb.h"
-#include "mgastate.h"
static void mgaRenderPrimitive( GLcontext *ctx, GLenum prim );
static void mgaRenderPrimitive( GLcontext *ctx, GLenum prim );
@@
-349,7
+347,6
@@
static struct {
#define DO_POINTS 1
#define DO_FULL_QUAD 1
#define DO_POINTS 1
#define DO_FULL_QUAD 1
-#define HAVE_RGBA 1
#define HAVE_BACK_COLORS 0
#define HAVE_SPEC 1
#define HAVE_HW_FLATSHADE 0
#define HAVE_BACK_COLORS 0
#define HAVE_SPEC 1
#define HAVE_HW_FLATSHADE 0
@@
-398,7
+395,8
@@
do { \
#define LOCAL_VARS(n) \
mgaContextPtr mmesa = MGA_CONTEXT(ctx); \
#define LOCAL_VARS(n) \
mgaContextPtr mmesa = MGA_CONTEXT(ctx); \
- GLuint color[n], spec[n]; \
+ GLuint color[n] = { 0 }; \
+ GLuint spec[n] = { 0 }; \
(void) color; (void) spec;
(void) color; (void) spec;