diff options
| author | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
| commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
| tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /src/mesa/main/texparam.c | |
| parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
| parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'src/mesa/main/texparam.c')
| -rw-r--r-- | src/mesa/main/texparam.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index db4c7a5edad..9e1a889bced 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -1165,6 +1165,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) return; } + _mesa_lock_texture(ctx, obj); switch (pname) { case GL_TEXTURE_MAG_FILTER: *params = (GLint) obj->MagFilter; |