diff options
| author | Brian Paul <[email protected]> | 2011-12-05 20:40:48 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-08 08:56:30 -0700 |
| commit | d0dc75c000d5af92648c7de901756400672b8447 (patch) | |
| tree | b24277323119309015a3d8a2e3aea266d09b4299 /src/mesa/drivers/dri/intel | |
| parent | b85284f45e8b05ba9a0dac8dd95a9c078e4a635e (diff) | |
mesa/drivers: use new swrast renderbuffer functions
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 15 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_span.c | 27 |
3 files changed, 23 insertions, 20 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c index 4f665a746e7..eeafe223443 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.c +++ b/src/mesa/drivers/dri/intel/intel_pixel.c @@ -25,6 +25,7 @@ * **************************************************************************/ +#include "main/accum.h" #include "main/enums.h" #include "main/state.h" #include "main/bufferobj.h" diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index f67bef95566..e4cc5b0864e 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -33,6 +33,7 @@ #include "main/hash.h" #include "main/fbobject.h" #include "main/mfeatures.h" +#include "swrast/s_renderbuffer.h" #include "utils.h" #include "xmlpool.h" @@ -470,13 +471,13 @@ intelCreateBuffer(__DRIscreen * driScrnPriv, } /* now add any/all software-based renderbuffers we may need */ - _mesa_add_soft_renderbuffers(fb, - false, /* never sw color */ - false, /* never sw depth */ - false, /* never sw stencil */ - mesaVis->accumRedBits > 0, - false, /* never sw alpha */ - false /* never sw aux */ ); + _swrast_add_soft_renderbuffers(fb, + false, /* never sw color */ + false, /* never sw depth */ + false, /* never sw stencil */ + mesaVis->accumRedBits > 0, + false, /* never sw alpha */ + false /* never sw aux */ ); driDrawPriv->driverPrivate = fb; return true; diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index d203617488c..43b815114ad 100644 --- a/src/mesa/drivers/dri/intel/intel_span.c +++ b/src/mesa/drivers/dri/intel/intel_span.c @@ -46,6 +46,7 @@ #include "intel_tex.h" #include "swrast/swrast.h" +#include "swrast/s_renderbuffer.h" static void intel_set_span_functions(struct intel_context *intel, @@ -415,19 +416,19 @@ static span_init_func intel_span_init_funcs[MESA_FORMAT_COUNT] = [MESA_FORMAT_XRGB8888] = intel_InitPointers_xRGB8888, [MESA_FORMAT_ARGB8888] = intel_InitPointers_ARGB8888, [MESA_FORMAT_SARGB8] = intel_InitPointers_ARGB8888, - [MESA_FORMAT_Z16] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_X8_Z24] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_S8_Z24] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_S8] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_R8] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_GR88] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_R16] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_RG1616] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_RGBA_FLOAT32] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_RG_FLOAT32] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_R_FLOAT32] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_INTENSITY_FLOAT32] = _mesa_set_renderbuffer_accessors, - [MESA_FORMAT_LUMINANCE_FLOAT32] = _mesa_set_renderbuffer_accessors, + [MESA_FORMAT_Z16] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_X8_Z24] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_S8_Z24] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_S8] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_R8] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_GR88] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_R16] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_RG1616] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_RGBA_FLOAT32] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_RG_FLOAT32] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_R_FLOAT32] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_INTENSITY_FLOAT32] = _swrast_set_renderbuffer_accessors, + [MESA_FORMAT_LUMINANCE_FLOAT32] = _swrast_set_renderbuffer_accessors, }; bool |