diff options
| author | Brian Paul <[email protected]> | 2011-04-10 12:44:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-04-10 13:12:49 -0600 |
| commit | ecfaab88b2577bd0395bc05d75a036126806a9c4 (patch) | |
| tree | 5abb78f767f546778d551a57f7f2cfe20c479f50 /src/mesa/drivers/dri/intel/intel_tex_image.c | |
| parent | 1cbd3a1cc734df16610a59dc49cdb42c70dc3270 (diff) | |
mesa: move sampler state into new gl_sampler_object type
gl_texture_object contains an instance of this type for the regular
texture object sampling state. glGenSamplers() generates new instances
of gl_sampler_object which can override that state with glBindSampler().
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index b3a2b1b0c85..775fd1008f9 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -112,8 +112,8 @@ intel_miptree_create_for_teximage(struct intel_context *intel, * resizable buffers, or require that buffers implement lazy * pagetable arrangements. */ - if ((intelObj->base.MinFilter == GL_NEAREST || - intelObj->base.MinFilter == GL_LINEAR) && + if ((intelObj->base.Sampler.MinFilter == GL_NEAREST || + intelObj->base.Sampler.MinFilter == GL_LINEAR) && intelImage->level == firstLevel && (intel->gen < 4 || firstLevel == 0)) { lastLevel = firstLevel; |