diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-06-23 00:01:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-06-23 00:01:17 +1000 |
| commit | aa3ab377e6e2e5811cdd704d87c3e24acb5eff72 (patch) | |
| tree | ab8a443a58a58a6b88f35d4b5730ed1292e44d26 /src/mesa/state_tracker/st_cb_blit.c | |
| parent | 8c26a521ee80f5d8a1d0aabd0910233aad400322 (diff) | |
| parent | e2c3f06e9649b5b87fc9adbca7d1f07841bba895 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Diffstat (limited to 'src/mesa/state_tracker/st_cb_blit.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_blit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index 0533d9460f..327bafeb98 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -40,7 +40,6 @@ #include "st_context.h" #include "st_program.h" -#include "st_cb_drawpixels.h" #include "st_cb_blit.h" #include "st_cb_fbo.h" @@ -106,5 +105,7 @@ st_BlitFramebuffer(GLcontext *ctx, void st_init_blit_functions(struct dd_function_table *functions) { +#if FEATURE_EXT_framebuffer_blit functions->BlitFramebuffer = st_BlitFramebuffer; +#endif } |