diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-02-22 18:06:19 -0500 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-02-22 21:44:00 -0500 |
commit | dd1d66fc4ab5d7064113a2017a431c3461598b91 (patch) | |
tree | e09343282afaeddb69547133097a435981239b56 /src/mesa/drivers/dri/i965/brw_context.c | |
parent | c99fa92ff84e927c82e1231d96921fda9a2b0852 (diff) |
intel: Merge intel_context.c from i915 and i965.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_context.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 3c463c3b9a..6b2e16e4e8 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -38,6 +38,8 @@ #include "intel_tex.h" #include "intel_blit.h" #include "intel_batchbuffer.h" +#include "intel_pixel.h" +#include "tnl/t_pipeline.h" #include "utils.h" #include "api_noop.h" @@ -91,6 +93,15 @@ static void brwInitProgFuncs( struct dd_function_table *functions ) static void brwInitDriverFunctions( struct dd_function_table *functions ) { intelInitDriverFunctions( functions ); + + /* CopyPixels can be accelerated even with the current memory + * manager: + */ + if (!getenv("INTEL_NO_BLIT")) { + functions->CopyPixels = intelCopyPixels; + functions->Bitmap = intelBitmap; + } + brwInitFragProgFuncs( functions ); brwInitProgFuncs( functions ); } @@ -143,6 +154,8 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis, return GL_FALSE; } + TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline; + ctx->Const.MaxTextureUnits = BRW_MAX_TEX_UNIT; ctx->Const.MaxTextureImageUnits = BRW_MAX_TEX_UNIT; ctx->Const.MaxTextureCoordUnits = BRW_MAX_TEX_UNIT; |