diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-14 06:41:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-14 06:41:54 +0000 |
| commit | 019fc27ce6dc2a1809107be10d4deb80e0fa436b (patch) | |
| tree | 57bc2571720a5d6e518ef15879d56ea066df494c /mesalib/src/mesa/main/samplerobj.c | |
| parent | 7bcdd32ccff794b9a83a88ff9bc2d0b7b088bd06 (diff) | |
| download | vcxsrv-019fc27ce6dc2a1809107be10d4deb80e0fa436b.tar.gz vcxsrv-019fc27ce6dc2a1809107be10d4deb80e0fa436b.tar.bz2 vcxsrv-019fc27ce6dc2a1809107be10d4deb80e0fa436b.zip | |
server xkeyboard-config mesa git update 14 Apr 2011
Diffstat (limited to 'mesalib/src/mesa/main/samplerobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/samplerobj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 55acb6d1f..2d3879c06 100644 --- a/mesalib/src/mesa/main/samplerobj.c +++ b/mesalib/src/mesa/main/samplerobj.c @@ -63,7 +63,7 @@ _mesa_reference_sampler_object(struct gl_context *ctx, return; if (*ptr) { - /* Unreference the old buffer */ + /* Unreference the old sampler */ GLboolean deleteFlag = GL_FALSE; struct gl_sampler_object *oldSamp = *ptr; @@ -90,9 +90,9 @@ _mesa_reference_sampler_object(struct gl_context *ctx, /* reference new sampler */ /*_glthread_LOCK_MUTEX(samp->Mutex);*/ if (samp->RefCount == 0) { - /* this buffer's being deleted (look just above) */ + /* this sampler's being deleted (look just above) */ /* Not sure this can every really happen. Warn if it does. */ - _mesa_problem(NULL, "referencing deleted buffer object"); + _mesa_problem(NULL, "referencing deleted sampler object"); *ptr = NULL; } else { @@ -281,7 +281,7 @@ _mesa_BindSampler(GLuint unit, GLuint sampler) /** - * Check if a coordinate wrap mode is supported for the texture target. + * Check if a coordinate wrap mode is legal. * \return GL_TRUE if legal, GL_FALSE otherwise */ static GLboolean |