diff options
Diffstat (limited to 'src/mesa/drivers/dri/ffb')
-rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_span.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_state.c | 17 | ||||
-rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_xmesa.c | 10 |
3 files changed, 11 insertions, 18 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_span.c b/src/mesa/drivers/dri/ffb/ffb_span.c index f4698c64e4..a23f4c66f0 100644 --- a/src/mesa/drivers/dri/ffb/ffb_span.c +++ b/src/mesa/drivers/dri/ffb/ffb_span.c @@ -114,7 +114,7 @@ do { GLuint p = *(GLuint *)(buf + ((__x)<<2) + ((__y)<<13)); \ #define TAG(x) ffb##x##_888 -#include <spantmp.h> +#include "spantmp.h" /** * Plug in the Get/Put routines for the given driRenderbuffer. diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c index 86df5b4bca..95ff820e10 100644 --- a/src/mesa/drivers/dri/ffb/ffb_state.c +++ b/src/mesa/drivers/dri/ffb/ffb_state.c @@ -510,6 +510,13 @@ static void ffbDDReadBuffer(GLcontext *ctx, GLenum buffer) /* * Specifies buffer for sw fallbacks (spans) */ +#if 000 +/* XXX + * This function is obsolete. It's not clear how this really effected + * span reading/writing above. The span functions should use the + * incoming driRenderbuffer (gl_renderbuffer) pointer to determine how + * to read from the specified bufer. + */ static void ffbDDSetBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, GLuint bufferBit) { @@ -546,6 +553,8 @@ static void ffbDDSetBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, FFB_MAKE_DIRTY(fmesa, FFB_STATE_FBC, 1); } } +#endif + static void ffbDDClearColor(GLcontext *ctx, const GLfloat color[4]) { @@ -1091,14 +1100,6 @@ void ffbDDInitStateFuncs(GLcontext *ctx) ctx->Driver.ClearIndex = 0; ctx->Driver.IndexMask = 0; */ - - { - struct swrast_device_driver *swdd = - _swrast_GetDeviceDriverReference(ctx); - swdd->SetBuffer = ffbDDSetBuffer; - } - - } void ffbDDInitContextHwState(GLcontext *ctx) diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c index 530c5373a9..29aab4acba 100644 --- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c +++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c @@ -339,14 +339,6 @@ ffbCreateBuffer(__DRIscreenPrivate *driScrnPriv, } else { GLboolean swStencil = (mesaVis->stencilBits > 0 && mesaVis->depthBits != 24); -#if 0 - driDrawPriv->driverPrivate = (void *) - _mesa_create_framebuffer(mesaVis, - GL_FALSE, /* software depth buffer? */ - mesaVis->stencilBits > 0, - mesaVis->accumRedBits > 0, - mesaVis->alphaBits > 0); -#else struct gl_framebuffer *fb = _mesa_create_framebuffer(mesaVis); { @@ -385,7 +377,7 @@ ffbCreateBuffer(__DRIscreenPrivate *driScrnPriv, GL_FALSE, /* alpha */ GL_FALSE /* aux */); driDrawPriv->driverPrivate = (void *) fb; -#endif + return (driDrawPriv->driverPrivate != NULL); } } |