diff options
author | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-01-25 14:46:17 -0700 |
commit | 9b22427911ad27efc1f36faee9462c6082d0417c (patch) | |
tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c /src/mesa/drivers/dri/r300/r300_state.c | |
parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff) | |
parent | 6749310d3f60df70ad8f82db986871ab9496793b (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index c51285aad9..017d45a503 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -58,13 +58,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r300_state.h" #include "r300_reg.h" #include "r300_emit.h" -#include "r300_tex.h" #include "r300_fragprog_common.h" #include "r300_render.h" #include "r300_vertprog.h" -#include "drirenderbuffer.h" - static void r300BlendColor(GLcontext * ctx, const GLfloat cf[4]) { r300ContextPtr rmesa = R300_CONTEXT(ctx); |