projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
gamma
/
gamma_tris.c
diff --git
a/src/mesa/drivers/dri/gamma/gamma_tris.c
b/src/mesa/drivers/dri/gamma/gamma_tris.c
index 6457999b4ccef423a82c0753f53b90185d64461d..2903daf3f12eb53b8b9ae228526b06434cdda3de 100644
(file)
--- a/
src/mesa/drivers/dri/gamma/gamma_tris.c
+++ b/
src/mesa/drivers/dri/gamma/gamma_tris.c
@@
-25,19
+25,19
@@
* 3DLabs Gamma driver.
*/
* 3DLabs Gamma driver.
*/
-#include "gamma
_
context.h"
+#include "gammacontext.h"
#include "gamma_vb.h"
#include "gamma_tris.h"
#include "gamma_vb.h"
#include "gamma_tris.h"
-#include "glheader.h"
-#include "mtypes.h"
-#include "macros.h"
+#include "
main/
glheader.h"
+#include "m
ain/m
types.h"
+#include "ma
in/ma
cros.h"
#include "colormac.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/tnl.h"
#include "colormac.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "tnl/tnl.h"
-#include "tnl/t
_
context.h"
+#include "tnl/tcontext.h"
#include "tnl/t_pipeline.h"
#include "tnl/t_pipeline.h"
@@
-275,10
+275,10
@@
do { \
static struct {
static struct {
-
points_func
points;
-
line_func
line;
- t
riangle_func
triangle;
-
quad_func
quad;
+
tnl_points_func
points;
+
tnl_line_func
line;
+ t
nl_triangle_func
triangle;
+
tnl_quad_func
quad;
} rast_tab[GAMMA_MAX_TRIFUNC];
} rast_tab[GAMMA_MAX_TRIFUNC];
@@
-307,7
+307,7
@@
static struct {
#define VERT_Y(_v) _v->v.y
#define VERT_Z(_v) _v->v.z
#define AREA_IS_CCW( a ) (a > 0)
#define VERT_Y(_v) _v->v.y
#define VERT_Z(_v) _v->v.z
#define AREA_IS_CCW( a ) (a > 0)
-#define GET_VERTEX(e) (gmesa->verts + (e
<<gmesa->vertex_stride_shift
))
+#define GET_VERTEX(e) (gmesa->verts + (e
* gmesa->vertex_size * sizeof(int)
))
#define VERT_SET_RGBA( v, c ) \
do { \
#define VERT_SET_RGBA( v, c ) \
do { \
@@
-410,7
+410,7
@@
static void init_render_tab( void )
/* Render unclipped begin/end objects */
/**********************************************************************/
/* Render unclipped begin/end objects */
/**********************************************************************/
-#define VERT(x) (gammaVertex *)(gammaverts + (x
<< shift
))
+#define VERT(x) (gammaVertex *)(gammaverts + (x
* size * sizeof(int)
))
#define RENDER_POINTS( start, count ) \
for ( ; start < count ; start++) \
gmesa->draw_point( gmesa, VERT(start) )
#define RENDER_POINTS( start, count ) \
for ( ; start < count ; start++) \
gmesa->draw_point( gmesa, VERT(start) )
@@
-424,7
+424,7
@@
static void init_render_tab( void )
#undef LOCAL_VARS
#define LOCAL_VARS \
gammaContextPtr gmesa = GAMMA_CONTEXT(ctx); \
#undef LOCAL_VARS
#define LOCAL_VARS \
gammaContextPtr gmesa = GAMMA_CONTEXT(ctx); \
- const GLuint s
hift = gmesa->vertex_stride_shift;
\
+ const GLuint s
ize = gmesa->vertex_size;
\
const char *gammaverts = (char *)gmesa->verts; \
const GLboolean stipple = ctx->Line.StippleFlag; \
(void) stipple;
const char *gammaverts = (char *)gmesa->verts; \
const GLboolean stipple = ctx->Line.StippleFlag; \
(void) stipple;