diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-09 15:25:30 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-10 18:45:17 -0800 |
| commit | d11981e0d722282894b5012d37b2960ee3fbfac2 (patch) | |
| tree | 97bdb46ed247cf9ce2a15fd772c47fb2ceedfa31 /src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | |
| parent | f82f1ffba9f2e5971a6a3f3927ae3b22b798bab2 (diff) | |
intel: Fix some state leakage of {Client,}ActiveTexture in metaops.
Found while debugging cairo-gl.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel_bitmap.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 3a01f63dc7..1db7f5594e 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -495,6 +495,7 @@ intel_texture_bitmap(GLcontext * ctx, texcoords[3][1] = 1.0; _mesa_VertexPointer(4, GL_FLOAT, 4 * sizeof(GLfloat), &vertices); + _mesa_ClientActiveTextureARB(GL_TEXTURE0); _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), &texcoords); _mesa_Enable(GL_VERTEX_ARRAY); _mesa_Enable(GL_TEXTURE_COORD_ARRAY); |