diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
| commit | f56eda6a85912dee9eef9099f6023c6bab05a41a (patch) | |
| tree | 068107b1bcf1aec4847c059e18a3e5f3a0b3c303 /src/mesa/main/texobj.c | |
| parent | ce8e846ffea8e1a11b8ae4ba05a7386e7c34cc9f (diff) | |
| parent | 5549d35db5323829702099af6e53a8dd7c451524 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index b77a00dd15..c163a8158f 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -875,9 +875,9 @@ _mesa_BindTexture( GLenum target, GLuint texName ) if (newTexObj) { /* error checking */ if (newTexObj->Target != 0 && newTexObj->Target != target) { - /* the named texture object's dimensions don't match the target */ + /* the named texture object's target doesn't match the given target */ _mesa_error( ctx, GL_INVALID_OPERATION, - "glBindTexture(wrong dimensionality)" ); + "glBindTexture(target mismatch)" ); return; } if (newTexObj->Target == 0 && target == GL_TEXTURE_RECTANGLE_NV) { |