diff options
| author | Brian <brian@i915.localnet.net> | 2007-08-09 15:42:12 -0600 |
|---|---|---|
| committer | Brian <brian@i915.localnet.net> | 2007-08-09 15:42:12 -0600 |
| commit | fb8caffea8ac9a8f8e2ee63959264abe8eb36c59 (patch) | |
| tree | a1c8c67f92e573015940af43adf05970a1f6e842 /src/mesa/drivers/dri/intel_winsys/intel_context.c | |
| parent | 0c4c86cf2ce65d1284819dd14c649ac4c33cae33 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/mesa/drivers/dri/intel_winsys/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel_winsys/intel_context.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c index c4e8e0f95c..9d6ef058a3 100644 --- a/src/mesa/drivers/dri/intel_winsys/intel_context.c +++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c @@ -351,7 +351,7 @@ intelCreateContext(const __GLcontextModes * mesaVis, /* Initialize the software rasterizer and helper modules. */ _vbo_CreateContext(ctx); _tnl_CreateContext(ctx); - +#if 0 /* * Pipe-related setup */ @@ -404,7 +404,7 @@ intelCreateContext(const __GLcontextModes * mesaVis, default: assert(0); /*FIX*/ } - +#endif /* * memory pools @@ -465,6 +465,8 @@ intelCreateContext(const __GLcontextModes * mesaVis, */ if (!getenv("INTEL_HW")) { intel->pipe = intel_create_softpipe( intel ); + intel->pipe->surface_alloc = intel_new_surface; + intel->pipe->supported_formats = intel_supported_formats; } else { switch (intel->intelScreen->deviceID) { |