← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/mesa/main/samplerobj.c

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/samplerobj.c
251
251
   struct gl_sampler_object *sampObj;
252
252
   GET_CURRENT_CONTEXT(ctx);
253
253
 
254
 
   if (unit >= ctx->Const.MaxTextureImageUnits) {
 
254
   if (unit >= ctx->Const.MaxCombinedTextureImageUnits) {
255
255
      _mesa_error(ctx, GL_INVALID_VALUE, "glBindSampler(unit %u)", unit);
256
256
      return;
257
257
   }
294
294
   case GL_CLAMP:
295
295
   case GL_CLAMP_TO_EDGE:
296
296
   case GL_REPEAT:
 
297
   case GL_MIRRORED_REPEAT:
297
298
      return GL_TRUE;
298
299
   case GL_CLAMP_TO_BORDER:
299
300
      return e->ARB_texture_border_clamp;
300
 
   case GL_MIRRORED_REPEAT:
301
 
      return e->ARB_texture_mirrored_repeat;
302
301
   case GL_MIRROR_CLAMP_EXT:
303
302
      return e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp;
304
303
   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
314
313
/**
315
314
 * This is called just prior to changing any sampler object state.
316
315
 */
317
 
static INLINE void
 
316
static inline void
318
317
flush(struct gl_context *ctx)
319
318
{
320
319
   FLUSH_VERTICES(ctx, _NEW_TEXTURE);