projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
ffb
/
ffb_span.c
diff --git
a/src/mesa/drivers/dri/ffb/ffb_span.c
b/src/mesa/drivers/dri/ffb/ffb_span.c
index 0d3d604095523cf97c243031ddbde150bcc788b5..61901cccadd55e5c86fd944d98c830097f7632fa 100644
(file)
--- a/
src/mesa/drivers/dri/ffb/ffb_span.c
+++ b/
src/mesa/drivers/dri/ffb/ffb_span.c
@@
-31,8
+31,6
@@
#include "ffb_context.h"
#include "ffb_lock.h"
#include "ffb_context.h"
#include "ffb_lock.h"
-#include "swrast/swrast.h"
-
#define DBG 0
#define HW_LOCK() \
#define DBG 0
#define HW_LOCK() \
@@
-45,7
+43,7
@@
UNLOCK_HARDWARE(fmesa); \
#define LOCAL_VARS \
UNLOCK_HARDWARE(fmesa); \
#define LOCAL_VARS \
- __DRIdrawable
Private *dPriv = fmesa->driDrawable;
\
+ __DRIdrawable
*dPriv = fmesa->driDrawable;
\
GLuint height = dPriv->h; \
GLuint p; \
char *buf; \
GLuint height = dPriv->h; \
GLuint p; \
char *buf; \