diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-09-18 12:35:27 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-18 12:52:20 +0100 |
commit | 7bed8f46dc102229d39ddd102d35ad5965965417 (patch) | |
tree | 4e239c5cc685d5d6c02bc99cb9fd93dbb251b7c7 /src/mesa/drivers/dri/glamo/glamo_context.c | |
parent | 5bd2336e0fd6030af2eaa9e7a63ecd79a3ea8649 (diff) |
Loads of triangle and context stuff
Diffstat (limited to 'src/mesa/drivers/dri/glamo/glamo_context.c')
-rw-r--r-- | src/mesa/drivers/dri/glamo/glamo_context.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/glamo/glamo_context.c b/src/mesa/drivers/dri/glamo/glamo_context.c index d60785cabb..6e86faf32e 100644 --- a/src/mesa/drivers/dri/glamo/glamo_context.c +++ b/src/mesa/drivers/dri/glamo/glamo_context.c @@ -41,6 +41,8 @@ #include "glamo_state.h" #include "glamo_fbo.h" #include "glamo_tris.h" +#include "glamo_render.h" +#include "glamo_cmdq.h" #include <glamo_bo.h> #include <glamo_bo_gem.h> @@ -102,7 +104,6 @@ GLboolean glamoCreateContext(const __GLcontextModes *glVisual, glamoContextPtr context; glamoScreenPtr glamoScreen; struct dd_function_table functions; - TNLcontext *tnl; context = (glamoContextPtr)CALLOC(sizeof(*context)); if ( context == NULL ) return GL_FALSE; @@ -139,9 +140,8 @@ GLboolean glamoCreateContext(const __GLcontextModes *glVisual, _tnl_CreateContext(ctx); _swsetup_CreateContext(ctx); - /* use default TCL pipeline */ - tnl = TNL_CONTEXT(ctx); - tnl->Driver.RunPipeline = _tnl_run_pipeline; + /* Install our pipeline (see glamo_render.c) */ + _tnl_install_pipeline(ctx, glamo_pipeline); _swrast_allow_pixel_fog(ctx, GL_TRUE); _swrast_allow_vertex_fog(ctx, GL_FALSE); @@ -194,10 +194,14 @@ static void glamo_update_renderbuffers(__DRIcontext *context, screen = context->driScreenPriv; glamo = (glamoContextPtr)context->driverPrivate; i = 0; - if ( draw->color_rb[0] ) + if ( draw->color_rb[0] ) { + printf("Attaching front left buffer\n"); attachments[i++] = __DRI_BUFFER_FRONT_LEFT; - if ( draw->color_rb[1] ) + } + if ( draw->color_rb[1] ) { + printf("Attaching back left buffer\n"); attachments[i++] = __DRI_BUFFER_BACK_LEFT; + } buffers = screen->dri2.loader->getBuffers(drawable, &drawable->w, |