Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts: Makefile configs/default progs/glsl/Makefile src/gallium/auxiliary/util/u_simple_shaders.c src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_pixel.c src/mesa/drivers/dri/intel/intel_pixel_read.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
This commit is contained in:
commit
0c309bb494
|
@ -33,9 +33,9 @@ else:
|
|||
default_machine = _platform.machine()
|
||||
default_machine = _machine_map.get(default_machine, 'generic')
|
||||
|
||||
if default_platform in ('linux', 'freebsd', 'darwin'):
|
||||
if default_platform in ('linux', 'freebsd'):
|
||||
default_dri = 'yes'
|
||||
elif default_platform in ('winddk', 'windows', 'wince'):
|
||||
elif default_platform in ('winddk', 'windows', 'wince', 'darwin'):
|
||||
default_dri = 'no'
|
||||
else:
|
||||
default_dri = 'no'
|
||||
|
|
|
@ -69,7 +69,8 @@ typedef HWND NativeWindowType;
|
|||
typedef HBITMAP NativePixmapType;
|
||||
/** END Added for Windows **/
|
||||
|
||||
#elif defined(__gnu_linux__) || defined(__FreeBSD__) || defined(__sun)
|
||||
#elif defined(__gnu_linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__APPLE__)
|
||||
|
||||
|
||||
/** BEGIN Added for X (Mesa) **/
|
||||
#ifndef EGLAPI
|
||||
|
|
|
@ -131,8 +131,6 @@ util_make_fragment_tex_shader(struct pipe_context *pipe )
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Make simple fragment color pass-through shader.
|
||||
*/
|
||||
|
|
|
@ -390,6 +390,8 @@ struct brw_cached_batch_item {
|
|||
struct brw_vertex_element {
|
||||
const struct gl_client_array *glarray;
|
||||
|
||||
/** The corresponding Mesa vertex attribute */
|
||||
gl_vert_attrib attrib;
|
||||
/** Size of a complete element */
|
||||
GLuint element_size;
|
||||
/** Number of uploaded elements for this input. */
|
||||
|
|
|
@ -187,6 +187,7 @@ static void brw_merge_inputs( struct brw_context *brw,
|
|||
|
||||
for (i = 0; i < VERT_ATTRIB_MAX; i++) {
|
||||
brw->vb.inputs[i].glarray = arrays[i];
|
||||
brw->vb.inputs[i].attrib = (gl_vert_attrib) i;
|
||||
|
||||
if (arrays[i]->StrideB != 0)
|
||||
brw->vb.info.sizes[i/16] |= (brw->vb.inputs[i].glarray->Size - 1) <<
|
||||
|
|
|
@ -423,7 +423,7 @@ static void brw_prepare_vertices(struct brw_context *brw)
|
|||
/* Queue the buffer object up to be uploaded in the next pass,
|
||||
* when we've decided if we're doing interleaved or not.
|
||||
*/
|
||||
if (i == 0) {
|
||||
if (input->attrib == VERT_ATTRIB_POS) {
|
||||
/* Position array not properly enabled:
|
||||
*/
|
||||
if (input->glarray->StrideB == 0) {
|
||||
|
|
|
@ -261,6 +261,7 @@ do_blit_readpixels(GLcontext * ctx,
|
|||
if (!intel_intersect_cliprects(&rect, &src_rect, &box[i]))
|
||||
continue;
|
||||
|
||||
<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_pixel_read.c
|
||||
if (!intelEmitCopyBlit(intel,
|
||||
src->cpp,
|
||||
src->pitch, src->buffer, 0, src->tiling,
|
||||
|
@ -274,6 +275,18 @@ do_blit_readpixels(GLcontext * ctx,
|
|||
UNLOCK_HARDWARE(intel);
|
||||
return GL_FALSE;
|
||||
}
|
||||
=======
|
||||
intelEmitCopyBlit(intel,
|
||||
src->cpp,
|
||||
src->pitch, src->buffer, 0, src->tiling,
|
||||
rowLength, dst_buffer, dst_offset, GL_FALSE,
|
||||
rect.x1,
|
||||
rect.y1,
|
||||
rect.x1 - src_rect.x1,
|
||||
rect.y2 - src_rect.y2,
|
||||
rect.x2 - rect.x1, rect.y2 - rect.y1,
|
||||
GL_COPY);
|
||||
>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_pixel_read.c
|
||||
}
|
||||
}
|
||||
UNLOCK_HARDWARE(intel);
|
||||
|
|
|
@ -196,6 +196,13 @@ intel_region_alloc(struct intel_context *intel,
|
|||
else
|
||||
height = ALIGN(height, 2);
|
||||
|
||||
/* If we're untiled, we have to align to 2 rows high because the
|
||||
* data port accesses 2x2 blocks even if the bottom row isn't to be
|
||||
* rendered, so failure to align means we could walk off the end of the
|
||||
* GTT and fault.
|
||||
*/
|
||||
height = ALIGN(height, 2);
|
||||
|
||||
if (expect_accelerated_upload) {
|
||||
buffer = drm_intel_bo_alloc_for_render(intel->bufmgr, "region",
|
||||
pitch * cpp * height, 64);
|
||||
|
|
Loading…
Reference in New Issue