diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-16 19:08:53 -0700 |
| commit | 6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch) | |
| tree | 7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/mesa/drivers/dri/intel/intel_tex.h | |
| parent | 15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff) | |
| parent | a433cd286c60eb9d4c2114f042709eda0f3de676 (diff) | |
Merge branch 'glsl2'
Conflicts:
src/mesa/program/prog_optimize.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h index 4bb012dc65..cd77dd5b8e 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.h +++ b/src/mesa/drivers/dri/intel/intel_tex.h @@ -31,8 +31,6 @@ #include "main/mtypes.h" #include "main/formats.h" #include "intel_context.h" -#include "texmem.h" - void intelInitTextureFuncs(struct dd_function_table *functions); |