diff options
| author | Pauli Nieminen <[email protected]> | 2012-06-12 21:38:52 +0300 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-08-01 15:31:16 -0700 |
| commit | 6f6bd8aedcf2b2f0e1ca9a1fa7ded1cb1f5a88ed (patch) | |
| tree | c58ab2a0d102202d55daf280c09141bb74198f6c /src/mesa/drivers/dri/radeon/radeon_span.c | |
| parent | 10169e7adc40b445776453fcc6d3227d7dda5879 (diff) | |
radeon&r200: Add support for ARB_sampler_objects
Preparation for the mandatory support of ARB_sampler_objects. I have tested
this patch with rv280 only.
Signed-off-by: Pauli Nieminen <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_span.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_span.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c index 92f3d332a4b..0617adc5bc5 100644 --- a/src/mesa/drivers/dri/radeon/radeon_span.c +++ b/src/mesa/drivers/dri/radeon/radeon_span.c @@ -43,6 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/texformat.h" #include "main/renderbuffer.h" +#include "main/samplerobj.h" #include "swrast/swrast.h" #include "swrast/s_renderbuffer.h" @@ -124,7 +125,8 @@ static void radeonSpanRenderStart(struct gl_context * ctx) for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) { if (ctx->Texture.Unit[i]._ReallyEnabled) { - radeon_validate_texture_miptree(ctx, ctx->Texture.Unit[i]._Current); + radeon_validate_texture_miptree(ctx, _mesa_get_samplerobj(ctx, i), + ctx->Texture.Unit[i]._Current); radeon_swrast_map_texture_images(ctx, ctx->Texture.Unit[i]._Current); } } |