diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-24 08:57:48 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-24 08:57:48 -0600 |
| commit | bc5c40d7d99a51f5b6080bf85080e4984e528dfd (patch) | |
| tree | 01ec0a76de26f5ba4e968b1c73c2b26bf80b86c4 /src/mesa/drivers/dri/intel/intel_pixel_draw.c | |
| parent | a04af335a42ce3b28e59ff9b85b2bd433a9d7b12 (diff) | |
intel: fix additional merge conflicts missed in previous commit
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel_draw.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_draw.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c index b8825dbaef..d79d625f77 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c @@ -359,12 +359,8 @@ intel_stencil_drawpixels(GLcontext * ctx, _mesa_VertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), &vertices); _mesa_Enable(GL_VERTEX_ARRAY); -<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_pixel_draw.c intel_meta_set_default_texrect(intel); -======= - _mesa_Enable(GL_TEXTURE_COORD_ARRAY); ->>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_pixel_draw.c _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); intel_meta_restore_texcoords(intel); |