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/perrtblend'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r300
/
r300_render.c
diff --git
a/src/mesa/drivers/dri/r300/r300_render.c
b/src/mesa/drivers/dri/r300/r300_render.c
index 4ae593cbe79a6df457585e88d3a8b96dbb9f5faf..e3e62857840ca0dd571f08add9f0dc98b76e9ea2 100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_render.c
+++ b/
src/mesa/drivers/dri/r300/r300_render.c
@@
-53,7
+53,6
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r300_render.h"
#include "main/glheader.h"
#include "r300_render.h"
#include "main/glheader.h"
-#include "main/state.h"
#include "main/imports.h"
#include "main/enums.h"
#include "main/macros.h"
#include "main/imports.h"
#include "main/enums.h"
#include "main/macros.h"
@@
-65,15
+64,10
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast_setup/swrast_setup.h"
#include "vbo/vbo.h"
#include "vbo/vbo_split.h"
#include "swrast_setup/swrast_setup.h"
#include "vbo/vbo.h"
#include "vbo/vbo_split.h"
-#include "tnl/tnl.h"
-#include "tnl/t_vp_build.h"
#include "r300_context.h"
#include "r300_context.h"
-#include "r300_ioctl.h"
#include "r300_state.h"
#include "r300_reg.h"
#include "r300_state.h"
#include "r300_reg.h"
-#include "r300_tex.h"
#include "r300_emit.h"
#include "r300_emit.h"
-#include "r300_fragprog_common.h"
#include "r300_swtcl.h"
/**
#include "r300_swtcl.h"
/**