fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'gallium-0.2' into gallium-winsys-private

Browse source
This commit is contained in:
José Fonseca 2009-01-30 14:07:12 +00:00
commit 46edad7d29
8 changed files with 30 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/auxiliary/pipebuffer/pb_buffer.h
View file

@ -255,7 +255,13 @@ pb_reference(struct pb_buffer **dst,
static INLINE boolean
pb_check_alignment(size_t requested, size_t provided)
{
return requested <= provided && (provided % requested) == 0 ? TRUE : FALSE;
if(!requested)
return TRUE;
if(requested > provided)
return FALSE;
if(provided % requested != 0)
return FALSE;
return TRUE;
}

30
src/gallium/drivers/i915simple/i915_blit.c
View file

@ -38,7 +38,7 @@
void
i915_fill_blit(struct i915_context *i915,
unsigned cpp,
short dst_pitch,
unsigned short dst_pitch,
struct pipe_buffer *dst_buffer,
unsigned dst_offset,
short x, short y,
@ -47,15 +47,23 @@ i915_fill_blit(struct i915_context *i915,
{
unsigned BR13, CMD;
I915_DBG(i915,
"%s dst:buf(%p)/%d+%d %d,%d sz:%dx%d\n",
__FUNCTION__,
dst_buffer, dst_pitch, dst_offset, x, y, w, h);
switch (cpp) {
case 1:
case 2:
case 3:
BR13 = dst_pitch | (0xF0 << 16) | (1 << 24);
BR13 = (((int) dst_pitch) & 0xffff) |
(0xF0 << 16) | (1 << 24);
CMD = XY_COLOR_BLT_CMD;
break;
case 4:
BR13 = dst_pitch | (0xF0 << 16) | (1 << 24) | (1 << 25);
BR13 = (((int) dst_pitch) & 0xffff) |
(0xF0 << 16) | (1 << 24) | (1 << 25);
CMD = (XY_COLOR_BLT_CMD | XY_COLOR_BLT_WRITE_ALPHA |
XY_COLOR_BLT_WRITE_RGB);
break;
@ -63,10 +71,6 @@ i915_fill_blit(struct i915_context *i915,
return;
}
// DBG("%s dst:buf(%p)/%d+%d %d,%d sz:%dx%d\n",
// __FUNCTION__, dst_buffer, dst_pitch, dst_offset, x, y, w, h);
if (!BEGIN_BATCH(6, 1)) {
FLUSH_BATCH(NULL);
assert(BEGIN_BATCH(6, 1));
@ -85,10 +89,10 @@ void
i915_copy_blit( struct i915_context *i915,
unsigned do_flip,
unsigned cpp,
short src_pitch,
unsigned short src_pitch,
struct pipe_buffer *src_buffer,
unsigned src_offset,
short dst_pitch,
unsigned short dst_pitch,
struct pipe_buffer *dst_buffer,
unsigned dst_offset,
short src_x, short src_y,
@ -106,20 +110,16 @@ i915_copy_blit( struct i915_context *i915,
src_buffer, src_pitch, src_offset, src_x, src_y,
dst_buffer, dst_pitch, dst_offset, dst_x, dst_y, w, h);
src_pitch *= (short) cpp;
dst_pitch *= (short) cpp;
switch (cpp) {
case 1:
case 2:
case 3:
BR13 = (((int) dst_pitch) & 0xffff) |
BR13 = (((int) dst_pitch) & 0xffff) |
(0xCC << 16) | (1 << 24);
CMD = XY_SRC_COPY_BLT_CMD;
break;
case 4:
BR13 =
(((int) dst_pitch) & 0xffff) |
BR13 = (((int) dst_pitch) & 0xffff) |
(0xCC << 16) | (1 << 24) | (1 << 25);
CMD =
(XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA |

6
src/gallium/drivers/i915simple/i915_blit.h
View file

@ -33,10 +33,10 @@
extern void i915_copy_blit(struct i915_context *i915,
unsigned do_flip,
unsigned cpp,
short src_pitch,
unsigned short src_pitch,
struct pipe_buffer *src_buffer,
unsigned src_offset,
short dst_pitch,
unsigned short dst_pitch,
struct pipe_buffer *dst_buffer,
unsigned dst_offset,
short srcx, short srcy,
@ -45,7 +45,7 @@ extern void i915_copy_blit(struct i915_context *i915,
extern void i915_fill_blit(struct i915_context *i915,
unsigned cpp,
short dst_pitch,
unsigned short dst_pitch,
struct pipe_buffer *dst_buffer,
unsigned dst_offset,
short x, short y,

6
src/gallium/drivers/i915simple/i915_surface.c
View file

@ -79,8 +79,8 @@ i915_surface_copy(struct pipe_context *pipe,
i915_copy_blit( i915_context(pipe),
do_flip,
dst->block.size,
(short) src->stride, src->buffer, src->offset,
(short) dst->stride, dst->buffer, dst->offset,
(unsigned short) src->stride, src->buffer, src->offset,
(unsigned short) dst->stride, dst->buffer, dst->offset,
(short) srcx, (short) srcy, (short) dstx, (short) dsty, (short) width, (short) height );
}
}
@ -106,7 +106,7 @@ i915_surface_fill(struct pipe_context *pipe,
assert(dst->block.height == 1);
i915_fill_blit( i915_context(pipe),
dst->block.size,
(short) dst->stride,
(unsigned short) dst->stride,
dst->buffer, dst->offset,
(short) dstx, (short) dsty,
(short) width, (short) height,

2
src/gallium/state_trackers/Makefile
View file

@ -2,7 +2,7 @@ TOP = ../../..
include $(TOP)/configs/current
SUBDIRS = glx egl
SUBDIRS = glx
default: subdirs

16
src/gallium/state_trackers/egl/egl_surface.c
View file

@ -80,7 +80,6 @@ drm_create_texture(_EGLDriver *drv,
unsigned stride = 1024;
unsigned pitch = 0;
unsigned size = 0;
void *ptr;
/* ugly */
if (stride < w)
@ -98,14 +97,6 @@ drm_create_texture(_EGLDriver *drv,
if (!buf)
goto err_buf;
#if DEBUG
ptr = pipe_buffer_map(screen, buf, PIPE_BUFFER_USAGE_CPU_WRITE);
memset(ptr, 0xFF, size);
pipe_buffer_unmap(screen, buf);
#else
(void)ptr;
#endif
memset(&templat, 0, sizeof(templat));
templat.tex_usage |= PIPE_TEXTURE_USAGE_DISPLAY_TARGET;
templat.tex_usage |= PIPE_TEXTURE_USAGE_RENDER_TARGET;
@ -340,13 +331,6 @@ drm_show_screen_surface_mesa(_EGLDriver *drv, EGLDisplay dpy,
if (ret)
goto err_crtc;
pipe = drm_api_hocks.create_context(dev->screen);
pipe->surface_fill(pipe, scrn->surface,
0, 0,
scrn->front.width, scrn->front.height,
0xFF00FFFF);
pipe->destroy(pipe);
surf->screen = scrn;
scrn->surf = surf;

10
src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
View file

@ -68,8 +68,6 @@ intel_be_offset_relocation(struct intel_be_batchbuffer *batch,
offset = (unsigned)(batch->base.ptr - batch->base.map);
debug_printf(" - offset: %p\n", offset);
ret = drm_intel_bo_emit_reloc(batch->bo, offset,
bo, pre_add,
read_domains,
@ -106,18 +104,10 @@ intel_be_batchbuffer_flush(struct intel_be_batchbuffer *batch,
i915_batchbuffer_dword(i915, (0x0<<29)|(0xA<<23)); // MI_BATCH_BUFFER_END;
}
i915_dump_batchbuffer(i915);
debug_printf("%s\n", __FUNCTION__);
used = batch->base.ptr - batch->base.map;
debug_printf(" - subdata\n");
drm_intel_bo_subdata(batch->bo, 0, used, batch->base.map);
debug_printf(" - exec\n");
ret = drm_intel_bo_exec(batch->bo, used, NULL, 0, 0);
debug_printf(" - waiting\n");
drm_intel_bo_wait_rendering(batch->bo);
debug_printf(" - done\n");
assert(ret == 0);

4
src/gallium/winsys/drm/intel/gem/intel_be_context.c
View file

@ -33,15 +33,13 @@ intel_be_batch_reloc(struct i915_winsys *sws,
read |= I915_GEM_DOMAIN_VERTEX;
}
debug_printf("%s\n", __FUNCTION__);
debug_printf(" - flags: %u, read: %u, write: %u, delta: %p\n", access_flags, read, write, delta);
ret = intel_be_offset_relocation(intel->batch,
delta,
bo,
read,
write);
debug_printf(" - ret = %i\n", ret);
assert(ret == 0);
/* TODO change return type */
/* return ret; */
}