intel: fix additional merge conflicts missed in previous commit

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index ff8acc5c58d8937b5450db80f6fa8f15ffef203f..aed0e45a28f35508c79b3814ecaed9164d923d7b 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -300,34 +300,20 @@ intel_bufferobj_buffer(struct intel_context *intel,
    }
 
    if (intel_obj->buffer == NULL) {
-<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
       void *sys_buffer = intel_obj->sys_buffer;
 
       /* only one of buffer and sys_buffer could be non-NULL */
-=======
->>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
       intel_bufferobj_alloc_buffer(intel, intel_obj);
-<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
       intel_obj->sys_buffer = NULL;
 
-=======
->>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
       intel_bufferobj_subdata(&intel->ctx,
                              GL_ARRAY_BUFFER_ARB,
                              0,
                              intel_obj->Base.Size,
-<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
                              sys_buffer,
-=======
-                             intel_obj->sys_buffer,
->>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
                              &intel_obj->Base);
-<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
       _mesa_free(sys_buffer);
-=======
-      _mesa_free(intel_obj->sys_buffer);
       intel_obj->sys_buffer = NULL;
->>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
    }
 
    return intel_obj->buffer;

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index b8825dbaef55a0e3156cd079e1edd1aede801764..d79d625f770390184f98af59a467f40fa29d03f3 100644 (file)
--- 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);